[Cmake-commits] CMake branch, next, updated. v3.7.2-2465-g9f309d0

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9f309d00e86fea6ffe1deb30384d4789d5f90e45 (commit)
       via  c9ee05d8d9b5d2ab1539d469682a4a3974282443 (commit)
      from  915c71e3a05dc7f33ba662a9c116b090befa140b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f309d00e86fea6ffe1deb30384d4789d5f90e45
commit 9f309d00e86fea6ffe1deb30384d4789d5f90e45
Merge: 915c71e c9ee05d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 1 08:49:31 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 1 08:49:31 2017 -0500

    Merge topic 'FortranCInterface-vs-intel-workaround' into next
    
    c9ee05d8 FortranCInterface: Fix support for VS with Intel toolset


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9ee05d8d9b5d2ab1539d469682a4a3974282443
commit c9ee05d8d9b5d2ab1539d469682a4a3974282443
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 11:06:20 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 1 08:47:42 2017 -0500

    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

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}"

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake