[Cmake-commits] CMake branch, next, updated. v2.8.2-938-g43cdcf0

[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  43cdcf02e480c0ad02826694b7fbc296ac021c72 (commit)
       via  20f49730ae53576812c9661aa6355d83f02cffde (commit)
      from  a1434f172c08693081b01834cc6d514747b63829 (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=43cdcf02e480c0ad02826694b7fbc296ac021c72
commit 43cdcf02e480c0ad02826694b7fbc296ac021c72
Merge: a1434f1 20f4973
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 28 10:18:12 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 28 10:18:12 2010 -0400

    Merge topic 'vs-load-Windows-ifort' into next
    
    20f4973 Reset platform/compiler info status for each language


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20f49730ae53576812c9661aa6355d83f02cffde
commit 20f49730ae53576812c9661aa6355d83f02cffde
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 28 09:49:20 2010 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 28 09:49:20 2010 -0400

    Reset platform/compiler info status for each language
    
    In each CMake<lang>Information.cmake file we use an _INCLUDED_FILE
    variable to track whether a compiler information file has been loaded.
    Reset this variable for each language.
    
    This fixes Fortran under VS generators with the Intel plugin.
    Previously the variable would be left set true from C and C++ and then
    Fortran would not load old-style files like Platform/Windows-ifort.

diff --git a/Modules/CMakeCInformation.cmake b/Modules/CMakeCInformation.cmake
index 578aff9..86a824a 100644
--- a/Modules/CMakeCInformation.cmake
+++ b/Modules/CMakeCInformation.cmake
@@ -26,6 +26,8 @@ ELSE(UNIX)
   SET(CMAKE_C_OUTPUT_EXTENSION .obj)
 ENDIF(UNIX)
 
+SET(_INCLUDED_FILE 0)
+
 # Load compiler-specific information.
 IF(CMAKE_C_COMPILER_ID)
   INCLUDE(Compiler/${CMAKE_C_COMPILER_ID}-C OPTIONAL)
diff --git a/Modules/CMakeCXXInformation.cmake b/Modules/CMakeCXXInformation.cmake
index 869894c..680f8fd 100644
--- a/Modules/CMakeCXXInformation.cmake
+++ b/Modules/CMakeCXXInformation.cmake
@@ -26,6 +26,8 @@ ELSE(UNIX)
   SET(CMAKE_CXX_OUTPUT_EXTENSION .obj)
 ENDIF(UNIX)
 
+SET(_INCLUDED_FILE 0)
+
 # Load compiler-specific information.
 IF(CMAKE_CXX_COMPILER_ID)
   INCLUDE(Compiler/${CMAKE_CXX_COMPILER_ID}-CXX OPTIONAL)
diff --git a/Modules/CMakeFortranInformation.cmake b/Modules/CMakeFortranInformation.cmake
index cdb8038..f6a52c6 100644
--- a/Modules/CMakeFortranInformation.cmake
+++ b/Modules/CMakeFortranInformation.cmake
@@ -16,6 +16,8 @@
 # It also loads the available platform file for the system-compiler
 # if it exists.
 
+SET(_INCLUDED_FILE 0)
+
 # Load compiler-specific information.
 IF(CMAKE_Fortran_COMPILER_ID)
   INCLUDE(Compiler/${CMAKE_Fortran_COMPILER_ID}-Fortran OPTIONAL)

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

Summary of changes:
 Modules/CMakeCInformation.cmake       |    2 ++
 Modules/CMakeCXXInformation.cmake     |    2 ++
 Modules/CMakeFortranInformation.cmake |    2 ++
 3 files changed, 6 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake