diff options
| author | Brad King <brad.king@kitware.com> | 2017-01-31 16:06:20 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-02-01 13:47:42 (GMT) |
| commit | c9ee05d8d9b5d2ab1539d469682a4a3974282443 (patch) | |
| tree | eb1d400770cb2ba225c86d4dc11cfaddb39670a6 | |
| parent | 5efb8b9a5df82fef0b6abac11f590f2a655c184e (diff) | |
| download | CMake-c9ee05d8d9b5d2ab1539d469682a4a3974282443.zip CMake-c9ee05d8d9b5d2ab1539d469682a4a3974282443.tar.gz CMake-c9ee05d8d9b5d2ab1539d469682a4a3974282443.tar.bz2 | |
FortranCInterface: Fix support for VS with Intel toolset
When using a Visual Studio generator with an Intel toolset, such as
-T "Intel C++ Compiler XE 14.0"
the generated FortranCInterface mangling detection project may fail to
build due to `devenv` not working with the `/project ALL_BUILD` option.
This seems to be a bug in `devenv` or the Intel VS integration. Work
around the problem by building with `/project FortranCInterface`
instead. We only need to build this executable and its dependencies
within the detection test project anyway.
Fixes: #16519
| -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 3899a2d..893a96f 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 9984efd..7612890 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}" |