[cmake-commits] king committed CMakeCInformation.cmake 1.10 1.10.4.1 CMakeCXXInformation.cmake 1.13 1.13.2.1

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv19216

Modified Files:
      Tag: CMake-Modules-CompilerId
	CMakeCInformation.cmake CMakeCXXInformation.cmake 
Log Message:
ENH: Added code to load CompilerId version of platform file if it exists.  Set CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS only if it is not already defined.


Index: CMakeCXXInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXInformation.cmake,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -d -r1.13 -r1.13.2.1
--- CMakeCXXInformation.cmake	15 Sep 2006 18:08:36 -0000	1.13
+++ CMakeCXXInformation.cmake	1 May 2007 22:26:19 -0000	1.13.2.1
@@ -8,6 +8,11 @@
 IF(CMAKE_COMPILER_IS_GNUCXX)
   SET(CMAKE_BASE_NAME g++)
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+IF(CMAKE_CXX_COMPILER_ID)
+  IF(EXISTS ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_CXX_COMPILER_ID}-CXX.cmake)
+    SET(CMAKE_BASE_NAME ${CMAKE_CXX_COMPILER_ID}-CXX)
+  ENDIF(EXISTS ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_CXX_COMPILER_ID}-CXX.cmake)
+ENDIF(CMAKE_CXX_COMPILER_ID)
 SET(CMAKE_SYSTEM_AND_CXX_COMPILER_INFO_FILE
   ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake)
 INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL)
@@ -43,9 +48,9 @@
   SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS})
 ENDIF(NOT CMAKE_SHARED_LIBRARY_CXX_FLAGS)
 
-IF(NOT CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS)
+IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS)
   SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS})
-ENDIF(NOT CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS)
+ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS)
 
 IF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG)
   SET(CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG}) 

Index: CMakeCInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCInformation.cmake,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -u -d -r1.10 -r1.10.4.1
--- CMakeCInformation.cmake	11 Apr 2006 20:55:48 -0000	1.10
+++ CMakeCInformation.cmake	1 May 2007 22:26:19 -0000	1.10.4.1
@@ -7,6 +7,11 @@
 IF(CMAKE_COMPILER_IS_GNUCC)
   SET(CMAKE_BASE_NAME gcc)
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
+IF(CMAKE_C_COMPILER_ID)
+  IF(EXISTS ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_C_COMPILER_ID}-C.cmake)
+    SET(CMAKE_BASE_NAME ${CMAKE_C_COMPILER_ID}-C)
+  ENDIF(EXISTS ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_C_COMPILER_ID}-C.cmake)
+ENDIF(CMAKE_C_COMPILER_ID)
 SET(CMAKE_SYSTEM_AND_C_COMPILER_INFO_FILE 
   ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake)
 INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL)