kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Brad King 2010-09-28 09:49:20 -04:00
parent 4c06e23307
commit 20f49730ae
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/CMakeCInformation.cmake
View File

@ -26,6 +26,8 @@ ELSE(UNIX)
SET(CMAKE_C_OUTPUT_EXTENSION .obj) SET(CMAKE_C_OUTPUT_EXTENSION .obj)
ENDIF(UNIX) ENDIF(UNIX)
SET(_INCLUDED_FILE 0)
# Load compiler-specific information. # Load compiler-specific information.
IF(CMAKE_C_COMPILER_ID) IF(CMAKE_C_COMPILER_ID)
INCLUDE(Compiler/${CMAKE_C_COMPILER_ID}-C OPTIONAL) INCLUDE(Compiler/${CMAKE_C_COMPILER_ID}-C OPTIONAL)

2
Modules/CMakeCXXInformation.cmake
View File

@ -26,6 +26,8 @@ ELSE(UNIX)
SET(CMAKE_CXX_OUTPUT_EXTENSION .obj) SET(CMAKE_CXX_OUTPUT_EXTENSION .obj)
ENDIF(UNIX) ENDIF(UNIX)
SET(_INCLUDED_FILE 0)
# Load compiler-specific information. # Load compiler-specific information.
IF(CMAKE_CXX_COMPILER_ID) IF(CMAKE_CXX_COMPILER_ID)
INCLUDE(Compiler/${CMAKE_CXX_COMPILER_ID}-CXX OPTIONAL) INCLUDE(Compiler/${CMAKE_CXX_COMPILER_ID}-CXX OPTIONAL)

2
Modules/CMakeFortranInformation.cmake
View File

@ -16,6 +16,8 @@
# It also loads the available platform file for the system-compiler # It also loads the available platform file for the system-compiler
# if it exists. # if it exists.
SET(_INCLUDED_FILE 0)
# Load compiler-specific information. # Load compiler-specific information.
IF(CMAKE_Fortran_COMPILER_ID) IF(CMAKE_Fortran_COMPILER_ID)
INCLUDE(Compiler/${CMAKE_Fortran_COMPILER_ID}-Fortran OPTIONAL) INCLUDE(Compiler/${CMAKE_Fortran_COMPILER_ID}-Fortran OPTIONAL)