diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-01 09:16:25 -0500 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-02-01 09:16:25 -0500 |
| commit | e8f55c17371ced4c6d5eb19cf40cf1141c0ef62a (patch) | |
| tree | 37fc98c3ab6fc27c46a6d8e6222aa9f3a6f4ad93 | |
| parent | 2dfe480a9c3fe40699ad85aa0355111848df870b (diff) | |
| parent | c9ee05d8d9b5d2ab1539d469682a4a3974282443 (diff) | |
| download | cmake-e8f55c17371ced4c6d5eb19cf40cf1141c0ef62a.tar.gz | |
Merge topic 'FortranCInterface-vs-intel-workaround'
c9ee05d8 FortranCInterface: Fix support for VS with Intel toolset
| -rw-r--r-- | Modules/FortranCInterface.cmake | 3 | ||||
| -rw-r--r-- | Modules/FortranCInterface/Detect.cmake | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Modules/FortranCInterface.cmake b/Modules/FortranCInterface.cmake index 3899a2d563..893a96fb54 100644 --- a/Modules/FortranCInterface.cmake +++ b/Modules/FortranCInterface.cmake @@ -348,7 +348,8 @@ function(FortranCInterface_VERIFY) try_compile(FortranCInterface_VERIFY_${lang}_COMPILED ${FortranCInterface_BINARY_DIR}/Verify${lang} ${FortranCInterface_SOURCE_DIR}/Verify - VerifyFortranC + VerifyFortranC # project name + VerifyFortranC # target name CMAKE_FLAGS -DVERIFY_CXX=${verify_cxx} -DCMAKE_VERBOSE_MAKEFILE=ON "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}" diff --git a/Modules/FortranCInterface/Detect.cmake b/Modules/FortranCInterface/Detect.cmake index 9984efd327..76128902f1 100644 --- a/Modules/FortranCInterface/Detect.cmake +++ b/Modules/FortranCInterface/Detect.cmake @@ -30,7 +30,8 @@ set(_result) try_compile(FortranCInterface_COMPILED ${FortranCInterface_BINARY_DIR} ${FortranCInterface_SOURCE_DIR} - FortranCInterface + FortranCInterface # project name + FortranCInterface # target name CMAKE_FLAGS "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}" "-DCMAKE_Fortran_FLAGS:STRING=${CMAKE_Fortran_FLAGS}" |