diff options
| author | Brad King <brad.king@kitware.com> | 2010-09-28 13:49:20 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-09-28 13:49:20 (GMT) |
| commit | 20f49730ae53576812c9661aa6355d83f02cffde (patch) | |
| tree | afa4f674c1f8320c15edf6e0ebba2cc0c78c8045 /Modules | |
| parent | 4c06e233071bac7821e27fece0c4d597c12798eb (diff) | |
| download | CMake-20f49730ae53576812c9661aa6355d83f02cffde.zip CMake-20f49730ae53576812c9661aa6355d83f02cffde.tar.gz CMake-20f49730ae53576812c9661aa6355d83f02cffde.tar.bz2 | |
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.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeCInformation.cmake | 2 | ||||
| -rw-r--r-- | Modules/CMakeCXXInformation.cmake | 2 | ||||
| -rw-r--r-- | Modules/CMakeFortranInformation.cmake | 2 |
3 files changed, 6 insertions, 0 deletions
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) |