From: Matthias Maier Date: Tue, 22 Apr 2014 14:22:41 +0000 (+0000) Subject: CMake: Bugfixes: X-Git-Tag: v8.2.0-rc1~573 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50254578e7ab63afb4a0434931d1159e968e7364;p=dealii.git CMake: Bugfixes: Use DEAL_II_CXX_FLAGS for the top level library target Set the linker language to cxx git-svn-id: https://svn.dealii.org/trunk@32805 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/source/CMakeLists.txt b/deal.II/source/CMakeLists.txt index e16c106d46..f0c310e687 100644 --- a/deal.II/source/CMakeLists.txt +++ b/deal.II/source/CMakeLists.txt @@ -75,8 +75,9 @@ FOREACH(build ${DEAL_II_BUILD_TYPES}) # SOVERSION "${DEAL_II_PACKAGE_VERSION}" LINK_FLAGS "${DEAL_II_LINKER_FLAGS} ${DEAL_II_LINKER_FLAGS_${build}}" + LINKER_LANGUAGE "CXX" COMPILE_DEFINITIONS "${DEAL_II_DEFINITIONS};${DEAL_II_DEFINITIONS_${build}}" - COMPILE_FLAGS "${DEAL_II_CXX_FLAGS_${build}}" + COMPILE_FLAGS "${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${build}}" INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}" ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${DEAL_II_LIBRARY_RELDIR}" LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${DEAL_II_LIBRARY_RELDIR}"