[cmake-commits] alex committed CMakeDetermineSystem.cmake 1.18.4.2 1.18.4.3 CMakeSystem.cmake.in 1.4 1.4.16.1 CMakeSystemSpecificInformation.cmake 1.36 1.36.4.1 CheckTypeSize.cmake 1.23 1.23.4.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-CrossCompileBasic
	CMakeDetermineSystem.cmake CMakeSystem.cmake.in 
	CMakeSystemSpecificInformation.cmake CheckTypeSize.cmake 
Log Message:

ENH: only check for the type size if it hasn't already been set, put a bit
more information in the CMakeSystemInformation.cmake file if it has been
used with a toolchain file, use the file given in the toolchain file as
CMake_SYSTEM_INFO_FILE

Alex


Index: CMakeSystemSpecificInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeSystemSpecificInformation.cmake,v
retrieving revision 1.36
retrieving revision 1.36.4.1
diff -u -d -r1.36 -r1.36.4.1
--- CMakeSystemSpecificInformation.cmake	15 Sep 2006 18:08:36 -0000	1.36
+++ CMakeSystemSpecificInformation.cmake	11 May 2007 14:34:48 -0000	1.36.4.1
@@ -6,10 +6,17 @@
 # include Generic system information
 INCLUDE(CMakeGenericSystem)
 
+message(STATUS "****************** CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}")
+message(STATUS "****************** CMAKE_SYSTEM_INFO_FILE: ${CMAKE_SYSTEM_INFO_FILE}")
+
 # 2. now include SystemName.cmake file to set the system specific information
-SET(CMAKE_SYSTEM_INFO_FILE ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}.cmake)
+IF(NOT CMAKE_SYSTEM_INFO_FILE)
+  SET(CMAKE_SYSTEM_INFO_FILE ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}.cmake)
+ENDIF(NOT CMAKE_SYSTEM_INFO_FILE)
+
 IF(EXISTS ${CMAKE_SYSTEM_INFO_FILE})
-  INCLUDE(Platform/${CMAKE_SYSTEM_NAME} OPTIONAL)
+  INCLUDE(${CMAKE_SYSTEM_INFO_FILE} OPTIONAL)
+#  INCLUDE(Platform/${CMAKE_SYSTEM_NAME} OPTIONAL)
 ELSE(EXISTS ${CMAKE_SYSTEM_INFO_FILE})
   MESSAGE("System is unknown to cmake, create:\n${CMAKE_SYSTEM_INFO_FILE}"
           " to use this system, please send your config file to "

Index: CMakeDetermineSystem.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineSystem.cmake,v
retrieving revision 1.18.4.2
retrieving revision 1.18.4.3
diff -u -d -r1.18.4.2 -r1.18.4.3
--- CMakeDetermineSystem.cmake	1 May 2007 17:13:08 -0000	1.18.4.2
+++ CMakeDetermineSystem.cmake	11 May 2007 14:34:48 -0000	1.18.4.3
@@ -27,8 +27,10 @@
 # MacOSX                        Darwin
 
 IF(CMAKE_TOOLCHAIN_FILE)
-   GET_FILENAME_COMPONENT(_ABS_CMAKE_TOOLCHAIN_FILE ${CMAKE_TOOLCHAIN_FILE} ABSOLUTE)
-   INCLUDE(${_ABS_CMAKE_TOOLCHAIN_FILE})
+  INCLUDE(${CMAKE_TOOLCHAIN_FILE})
+  IF(NOT DEFINED CMAKE_ALIEN_EXECUTABLES)
+    SET(CMAKE_ALIEN_EXECUTABLES TRUE)
+  ENDIF(NOT DEFINED CMAKE_ALIEN_EXECUTABLES)
 ENDIF(CMAKE_TOOLCHAIN_FILE)
 
 IF(NOT CMAKE_SYSTEM_NAME)

Index: CheckTypeSize.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CheckTypeSize.cmake,v
retrieving revision 1.23
retrieving revision 1.23.4.1
diff -u -d -r1.23 -r1.23.4.1
--- CheckTypeSize.cmake	14 Jun 2006 16:28:29 -0000	1.23
+++ CheckTypeSize.cmake	11 May 2007 14:34:48 -0000	1.23.4.1
@@ -13,6 +13,7 @@
 #  CMAKE_REQUIRED_LIBRARIES = list of libraries to link
 
 MACRO(CHECK_TYPE_SIZE TYPE VARIABLE)
+  IF(NOT DEFINED ${VARIABLE})
   SET(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS 1)
   IF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
     SET(CHECK_TYPE_SIZE_TYPE "${TYPE}")
@@ -65,4 +66,5 @@
     ENDIF(HAVE_${VARIABLE})
   ENDIF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
   SET(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS )
+  ENDIF(NOT DEFINED ${VARIABLE})
 ENDMACRO(CHECK_TYPE_SIZE)

Index: CMakeSystem.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeSystem.cmake.in,v
retrieving revision 1.4
retrieving revision 1.4.16.1
diff -u -d -r1.4 -r1.4.16.1
--- CMakeSystem.cmake.in	11 Jun 2003 14:07:57 -0000	1.4
+++ CMakeSystem.cmake.in	11 May 2007 14:34:48 -0000	1.4.16.1
@@ -1,5 +1,21 @@
-SET(CMAKE_SYSTEM "@CMAKE_SYSTEM@")
-SET(CMAKE_SYSTEM_NAME "@CMAKE_SYSTEM_NAME@")
-SET(CMAKE_SYSTEM_VERSION "@CMAKE_SYSTEM_VERSION@")
-SET(CMAKE_SYSTEM_PROCESSOR "@CMAKE_SYSTEM_PROCESSOR@")
+IF("@CMAKE_TOOLCHAIN_FILE@" STREQUAL "")
+
+  SET(CMAKE_SYSTEM "@CMAKE_SYSTEM@")
+  SET(CMAKE_SYSTEM_NAME "@CMAKE_SYSTEM_NAME@")
+  SET(CMAKE_SYSTEM_VERSION "@CMAKE_SYSTEM_VERSION@")
+  SET(CMAKE_SYSTEM_PROCESSOR "@CMAKE_SYSTEM_PROCESSOR@")
+  
+ELSE("@CMAKE_TOOLCHAIN_FILE@" STREQUAL "")
+
+  INCLUDE("@CMAKE_TOOLCHAIN_FILE@")
+
+# set CMAKE_SYSTEM to the CMAKE_SYSTEM_NAME
+  SET(CMAKE_SYSTEM  ${CMAKE_SYSTEM_NAME})
+# if there is a CMAKE_SYSTEM_VERSION then add a -${CMAKE_SYSTEM_VERSION}
+  IF(CMAKE_SYSTEM_VERSION)
+    SET(CMAKE_SYSTEM ${CMAKE_SYSTEM}-${CMAKE_SYSTEM_VERSION})
+  ENDIF(CMAKE_SYSTEM_VERSION)
+
+ENDIF("@CMAKE_TOOLCHAIN_FILE@" STREQUAL "")
+
 SET(CMAKE_SYSTEM_LOADED 1)