CMake: Bugfix: Do not use COMPILE_LANGUAGE if configuring for MSVC

Closes #5782

diff --git a/cmake/macros/macro_deal_ii_add_library.cmake b/cmake/macros/macro_deal_ii_add_library.cmake
index c6a0c8bdca2079facf342527785f3d47cbb41511..dde147a6843ff76ffb692be34cc8d052b336542e 100644 (file)
--- a/cmake/macros/macro_deal_ii_add_library.cmake
+++ b/cmake/macros/macro_deal_ii_add_library.cmake
@@ -40,7 +40,7 @@ MACRO(DEAL_II_ADD_LIBRARY _library)
       LINKER_LANGUAGE "CXX"
       )
 
-    IF(CMAKE_VERSION VERSION_LESS 3.9)
+    IF(CMAKE_VERSION VERSION_LESS 3.9 OR CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
 
       SET_TARGET_PROPERTIES(${_library}_${_build_lowercase} PROPERTIES
         COMPILE_FLAGS "${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}"

diff --git a/cmake/macros/macro_deal_ii_insource_setup_target.cmake b/cmake/macros/macro_deal_ii_insource_setup_target.cmake
index fb19f757f51ef6bbffda0ebdb5f15b423ccac08e..5c0298d698befbe38f15d4785724058b04e3d562 100644 (file)
--- a/cmake/macros/macro_deal_ii_insource_setup_target.cmake
+++ b/cmake/macros/macro_deal_ii_insource_setup_target.cmake
@@ -39,7 +39,7 @@ MACRO(DEAL_II_INSOURCE_SETUP_TARGET _target _build)
       ${DEAL_II_INCLUDE_DIRS}
     )
 
-  IF(CMAKE_VERSION VERSION_LESS 3.9)
+  IF(CMAKE_VERSION VERSION_LESS 3.9 OR CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
     SET_PROPERTY(TARGET ${_target} APPEND_STRING PROPERTY
       COMPILE_FLAGS " ${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}"
       )

diff --git a/cmake/macros/macro_deal_ii_setup_target.cmake b/cmake/macros/macro_deal_ii_setup_target.cmake
index 981b2ae8f662e31aa7408cd42d9c5696a7670f03..7e3c80c00db684ce609ae4d22307cf311ecaefaf 100644 (file)
--- a/cmake/macros/macro_deal_ii_setup_target.cmake
+++ b/cmake/macros/macro_deal_ii_setup_target.cmake
@@ -110,7 +110,7 @@ MACRO(DEAL_II_SETUP_TARGET _target)
     LINK_FLAGS " ${DEAL_II_LINKER_FLAGS} ${DEAL_II_LINKER_FLAGS_${_build}}"
     )
 
-  IF(CMAKE_VERSION VERSION_LESS 3.9)
+  IF(CMAKE_VERSION VERSION_LESS 3.9 OR CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
     SET_PROPERTY(TARGET ${_target} APPEND_STRING PROPERTY
       COMPILE_FLAGS " ${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}"
       )