[Cmake-commits] CMake branch, next, updated. v2.8.5-1799-g7f0543a

[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  7f0543ad5c134094fca4c7600a681c2d41488ad0 (commit)
       via  38aab379629a797e959f93b40ba18e63f14d1f64 (commit)
      from  b2c81e96786d0ece8ce67d6884efc3314ec5d0ce (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=7f0543ad5c134094fca4c7600a681c2d41488ad0
commit 7f0543ad5c134094fca4c7600a681c2d41488ad0
Merge: b2c81e9 38aab37
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 2 10:58:55 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 2 10:58:55 2011 -0400

    Merge topic 'vs-compiler-id' into next
    
    38aab37 Set CMAKE_<lang>_COMPILER_ID for VS generators


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38aab379629a797e959f93b40ba18e63f14d1f64
commit 38aab379629a797e959f93b40ba18e63f14d1f64
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 2 08:37:05 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 2 08:56:01 2011 -0400

    Set CMAKE_<lang>_COMPILER_ID for VS generators
    
    Currently the VS generators do not support Intel C/C++ .icproj files and
    the MS tools do not include a Fortran compiler.  Therefore we can always
    set the C and CXX compiler IDs to "MSVC" and the Fortran ID to "Intel".
    
    This fixes a regression in support for the Intel Fortran compiler under
    the VS plugin introduced by commit cd43636c (Modernize Intel compiler
    info on Windows, 2010-12-16).  The commit moved the compiler information
    into platform files that only load when the proper compiler id is set.
    It worked for the NMake Makefiles generator but not for the VS IDE
    generator because it did not set the compiler id.

diff --git a/Modules/CMakeDetermineCCompiler.cmake b/Modules/CMakeDetermineCCompiler.cmake
index 06664c1..e2e268f 100644
--- a/Modules/CMakeDetermineCCompiler.cmake
+++ b/Modules/CMakeDetermineCCompiler.cmake
@@ -105,10 +105,7 @@ ENDIF (NOT _CMAKE_TOOLCHAIN_LOCATION)
 IF(${CMAKE_GENERATOR} MATCHES "Visual Studio")
   SET(CMAKE_C_COMPILER_ID_RUN 1)
   SET(CMAKE_C_PLATFORM_ID "Windows")
-
-  # TODO: Set the compiler id.  It is probably MSVC but
-  # the user may be using an integrated Intel compiler.
-  # SET(CMAKE_C_COMPILER_ID "MSVC")
+  SET(CMAKE_C_COMPILER_ID "MSVC")
 ENDIF(${CMAKE_GENERATOR} MATCHES "Visual Studio")
 
 IF(NOT CMAKE_C_COMPILER_ID_RUN)
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake
index e77672d..8298369 100644
--- a/Modules/CMakeDetermineCXXCompiler.cmake
+++ b/Modules/CMakeDetermineCXXCompiler.cmake
@@ -117,10 +117,7 @@ ENDIF (NOT _CMAKE_TOOLCHAIN_LOCATION)
 IF(${CMAKE_GENERATOR} MATCHES "Visual Studio")
   SET(CMAKE_CXX_COMPILER_ID_RUN 1)
   SET(CMAKE_CXX_PLATFORM_ID "Windows")
-
-  # TODO: Set the compiler id.  It is probably MSVC but
-  # the user may be using an integrated Intel compiler.
-  # SET(CMAKE_CXX_COMPILER_ID "MSVC")
+  SET(CMAKE_CXX_COMPILER_ID "MSVC")
 ENDIF(${CMAKE_GENERATOR} MATCHES "Visual Studio")
 IF(NOT CMAKE_CXX_COMPILER_ID_RUN)
   SET(CMAKE_CXX_COMPILER_ID_RUN 1)
diff --git a/Modules/CMakeDetermineFortranCompiler.cmake b/Modules/CMakeDetermineFortranCompiler.cmake
index ed4e983..efcba29 100644
--- a/Modules/CMakeDetermineFortranCompiler.cmake
+++ b/Modules/CMakeDetermineFortranCompiler.cmake
@@ -146,10 +146,7 @@ MARK_AS_ADVANCED(CMAKE_Fortran_COMPILER)
 IF(${CMAKE_GENERATOR} MATCHES "Visual Studio")
   SET(CMAKE_Fortran_COMPILER_ID_RUN 1)
   SET(CMAKE_Fortran_PLATFORM_ID "Windows")
-
-  # TODO: Set the compiler id.  It is probably MSVC but
-  # the user may be using an integrated Intel compiler.
-  # SET(CMAKE_Fortran_COMPILER_ID "MSVC")
+  SET(CMAKE_Fortran_COMPILER_ID "Intel")
 ENDIF(${CMAKE_GENERATOR} MATCHES "Visual Studio")
 
 IF(NOT CMAKE_Fortran_COMPILER_ID_RUN)

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

Summary of changes:
 Modules/CMakeDetermineCCompiler.cmake       |    5 +----
 Modules/CMakeDetermineCXXCompiler.cmake     |    5 +----
 Modules/CMakeDetermineFortranCompiler.cmake |    5 +----
 3 files changed, 3 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake