[Cmake-commits] [cmake-commits] king committed CMakeCInformation.cmake 1.24 1.25 CMakeCXXInformation.cmake 1.27 1.28 CMakeFortranInformation.cmake 1.22 1.23
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Jul 23 10:06:33 EDT 2009
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv17734/Modules
Modified Files:
CMakeCInformation.cmake CMakeCXXInformation.cmake
CMakeFortranInformation.cmake
Log Message:
ENH: Load platform-independent per-compiler files
This teaches the language configuration modules to load per-compiler
information for each language using the compiler id but no system name.
They look for modules named "Compiler/<id>-<lang>.cmake". Such modules
may specify compiler flags that do not depend on the platform.
Index: CMakeCXXInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXInformation.cmake,v
retrieving revision 1.27
retrieving revision 1.28
diff -C 2 -d -r1.27 -r1.28
*** CMakeCXXInformation.cmake 14 Oct 2008 20:07:11 -0000 1.27
--- CMakeCXXInformation.cmake 23 Jul 2009 14:06:30 -0000 1.28
***************
*** 14,17 ****
--- 14,22 ----
ENDIF(UNIX)
+ # Load compiler-specific information.
+ IF(CMAKE_CXX_COMPILER_ID)
+ INCLUDE(Compiler/${CMAKE_CXX_COMPILER_ID}-CXX OPTIONAL)
+ ENDIF(CMAKE_CXX_COMPILER_ID)
+
SET(CMAKE_BASE_NAME)
GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_CXX_COMPILER} NAME_WE)
Index: CMakeFortranInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFortranInformation.cmake,v
retrieving revision 1.22
retrieving revision 1.23
diff -C 2 -d -r1.22 -r1.23
*** CMakeFortranInformation.cmake 14 Oct 2008 20:07:11 -0000 1.22
--- CMakeFortranInformation.cmake 23 Jul 2009 14:06:31 -0000 1.23
***************
*** 4,7 ****
--- 4,12 ----
# if it exists.
+ # Load compiler-specific information.
+ IF(CMAKE_Fortran_COMPILER_ID)
+ INCLUDE(Compiler/${CMAKE_Fortran_COMPILER_ID}-Fortran OPTIONAL)
+ ENDIF(CMAKE_Fortran_COMPILER_ID)
+
SET(CMAKE_BASE_NAME)
GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_Fortran_COMPILER} NAME_WE)
Index: CMakeCInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCInformation.cmake,v
retrieving revision 1.24
retrieving revision 1.25
diff -C 2 -d -r1.24 -r1.25
*** CMakeCInformation.cmake 14 Oct 2008 20:07:11 -0000 1.24
--- CMakeCInformation.cmake 23 Jul 2009 14:06:30 -0000 1.25
***************
*** 13,16 ****
--- 13,22 ----
SET(CMAKE_C_OUTPUT_EXTENSION .obj)
ENDIF(UNIX)
+
+ # Load compiler-specific information.
+ IF(CMAKE_C_COMPILER_ID)
+ INCLUDE(Compiler/${CMAKE_C_COMPILER_ID}-C OPTIONAL)
+ ENDIF(CMAKE_C_COMPILER_ID)
+
SET(CMAKE_BASE_NAME)
GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_C_COMPILER} NAME_WE)
More information about the Cmake-commits
mailing list