[Cmake-commits] CMake branch, next, updated. v2.8.12-4176-gdead7bc

[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  dead7bc2b76f797aa6b060d79a1c09d19cb5805b (commit)
       via  1b7117a8248da32038c6f3503ffebe38089f8610 (commit)
      from  7bc80698845a1c34d334be563f47118960476912 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dead7bc2b76f797aa6b060d79a1c09d19cb5805b
commit dead7bc2b76f797aa6b060d79a1c09d19cb5805b
Merge: 7bc8069 1b7117a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Oct 19 06:49:14 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 19 06:49:14 2013 -0400

    Merge topic 'vs-intel-compiler' into next
    
    1b7117a VS 6: Do not try Intel Fortran .vfproj file with msdev


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b7117a8248da32038c6f3503ffebe38089f8610
commit 1b7117a8248da32038c6f3503ffebe38089f8610
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Oct 19 06:30:57 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Oct 19 06:37:22 2013 -0400

    VS 6: Do not try Intel Fortran .vfproj file with msdev
    
    Teach CMakeDetermineCompilerId to skip trying to build a .vfproj
    file for Intel Fortran under Visual Studio 6.  The msdev command-line
    build produces a popup error dialog that hangs the configuration.

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index e591f2c..0d7aa61 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -109,7 +109,11 @@ Id flags: ${testflags}
 ")
 
   # Compile the compiler identification source.
-  if("${CMAKE_GENERATOR}" MATCHES "Visual Studio ([0-9]+)")
+  if(CMAKE_GENERATOR STREQUAL "Visual Studio 6" AND
+      lang STREQUAL "Fortran")
+    set(CMAKE_${lang}_COMPILER_ID_RESULT 1)
+    set(CMAKE_${lang}_COMPILER_ID_OUTPUT "No Intel Fortran in VS 6")
+  elseif("${CMAKE_GENERATOR}" MATCHES "Visual Studio ([0-9]+)")
     set(vs_version ${CMAKE_MATCH_1})
     set(id_platform ${CMAKE_VS_PLATFORM_NAME})
     set(id_lang "${lang}")

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

Summary of changes:
 Modules/CMakeDetermineCompilerId.cmake |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake