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 e16c106d464ce556cae1e2c413635d5e64e19626..f0c310e6872bde71b4088e1d82ed6ca20cf94d6b 100644 (file)
--- 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}"