[Cmake-commits] CMake branch, next, updated. v3.7.2-2459-g5eb3c08

[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  5eb3c083401d6cf054a6841688702c0102b4aecb (commit)
       via  6de43c42ad12bd8bc92845cfcdbaf7d623e44ca3 (commit)
      from  17e5230ea6f68587ee2eda1145ef086d564e1229 (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=5eb3c083401d6cf054a6841688702c0102b4aecb
commit 5eb3c083401d6cf054a6841688702c0102b4aecb
Merge: 17e5230 6de43c4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 11:17:07 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 31 11:17:07 2017 -0500

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6de43c42ad12bd8bc92845cfcdbaf7d623e44ca3
commit 6de43c42ad12bd8bc92845cfcdbaf7d623e44ca3
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: Tue Jan 31 11:06:20 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/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:
 Modules/FortranCInterface/Detect.cmake |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake