[cmake-commits] alex committed CMakeDetermineCCompiler.cmake 1.39.2.3 1.39.2.4 CMakeDetermineCXXCompiler.cmake 1.34.2.2 1.34.2.3 CMakeSystemSpecificInformation.cmake 1.36.4.1 1.36.4.2 CPack.cmake 1.26 1.26.4.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-CrossCompileBasic
	CMakeDetermineCCompiler.cmake CMakeDetermineCXXCompiler.cmake 
	CMakeSystemSpecificInformation.cmake CPack.cmake 
Log Message:

ENH: also use the target platform strip and executable suffix in cpack
use the new include() parameter to handle both full-path and
module-name-only SYSTEM_INFO files

Alex


Index: CMakeDetermineCXXCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCXXCompiler.cmake,v
retrieving revision 1.34.2.2
retrieving revision 1.34.2.3
diff -u -d -r1.34.2.2 -r1.34.2.3
--- CMakeDetermineCXXCompiler.cmake	2 May 2007 15:56:44 -0000	1.34.2.2
+++ CMakeDetermineCXXCompiler.cmake	11 May 2007 17:06:55 -0000	1.34.2.3
@@ -87,6 +87,13 @@
 ENDIF(NOT CMAKE_RANLIB)
 MARK_AS_ADVANCED(CMAKE_RANLIB)
 
+# used in cpack
+FIND_PROGRAM(CMAKE_STRIP_COMMAND NAMES ${CMAKE_TOOLCHAIN_PREFIX}strip PATHS ${CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
+FIND_PROGRAM(CMAKE_STRIP_COMMAND NAMES ${CMAKE_TOOLCHAIN_PREFIX}strip)
+MARK_AS_ADVANCED(CMAKE_STRIP_COMMAND)
+
+# maybe check for more tools from binutils here ?
+
 # some exotic compilers have different extensions (e.g. sdcc uses .rel)
 # so don't overwrite it if it has been already defined by the user
 IF(NOT CMAKE_CXX_OUTPUT_EXTENSION)

Index: CMakeSystemSpecificInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeSystemSpecificInformation.cmake,v
retrieving revision 1.36.4.1
retrieving revision 1.36.4.2
diff -u -d -r1.36.4.1 -r1.36.4.2
--- CMakeSystemSpecificInformation.cmake	11 May 2007 14:34:48 -0000	1.36.4.1
+++ CMakeSystemSpecificInformation.cmake	11 May 2007 17:06:55 -0000	1.36.4.2
@@ -11,13 +11,12 @@
 
 # 2. now include SystemName.cmake file to set the system specific information
 IF(NOT CMAKE_SYSTEM_INFO_FILE)
-  SET(CMAKE_SYSTEM_INFO_FILE ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}.cmake)
+  SET(CMAKE_SYSTEM_INFO_FILE Platform/${CMAKE_SYSTEM_NAME})
 ENDIF(NOT CMAKE_SYSTEM_INFO_FILE)
 
-IF(EXISTS ${CMAKE_SYSTEM_INFO_FILE})
-  INCLUDE(${CMAKE_SYSTEM_INFO_FILE} OPTIONAL)
-#  INCLUDE(Platform/${CMAKE_SYSTEM_NAME} OPTIONAL)
-ELSE(EXISTS ${CMAKE_SYSTEM_INFO_FILE})
+INCLUDE(${CMAKE_SYSTEM_INFO_FILE} OPTIONAL _INCLUDED_SYSTEM_INFO_FILE)
+
+IF(NOT _INCLUDED_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 "
           "cmake at www.cmake.org so it can be added to cmake")
@@ -27,7 +26,7 @@
     MESSAGE("You CMakeCache.txt file was copied to CopyOfCMakeCache.txt. " 
             "Please send that file to cmake at www.cmake.org.")
    ENDIF(EXISTS ${CMAKE_BINARY_DIR}/CMakeCache.txt)
-ENDIF(EXISTS ${CMAKE_SYSTEM_INFO_FILE})
+ENDIF(NOT _INCLUDED_SYSTEM_INFO_FILE)
 
 
 # for most systems a module is the same as a shared library

Index: CPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.cmake,v
retrieving revision 1.26
retrieving revision 1.26.4.1
diff -u -d -r1.26 -r1.26.4.1
--- CPack.cmake	13 Feb 2007 19:13:51 -0000	1.26
+++ CPack.cmake	11 May 2007 17:06:55 -0000	1.26.4.1
@@ -55,6 +55,11 @@
   "${CMAKE_ROOT}/Templates/CPack.GenericDescription.txt")
 cpack_set_if_not_set(CPACK_RESOURCE_FILE_WELCOME
   "${CMAKE_ROOT}/Templates/CPack.GenericWelcome.txt")
+  
+cpack_set_if_not_set(CPACK_EXECUTABLE_SUFFIX "${CMAKE_EXECUTABLE_SUFFIX}")  
+if(CMAKE_STRIP_COMMAND)
+   cpack_set_if_not_set(CPACK_STRIP_COMMAND "${CMAKE_STRIP_COMMAND}")  
+endif(CMAKE_STRIP_COMMAND)
 
 cpack_set_if_not_set(CPACK_MODULE_PATH "${CMAKE_MODULE_PATH}")
 

Index: CMakeDetermineCCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCCompiler.cmake,v
retrieving revision 1.39.2.3
retrieving revision 1.39.2.4
diff -u -d -r1.39.2.3 -r1.39.2.4
--- CMakeDetermineCCompiler.cmake	2 May 2007 18:13:58 -0000	1.39.2.3
+++ CMakeDetermineCCompiler.cmake	11 May 2007 17:06:55 -0000	1.39.2.4
@@ -87,6 +87,13 @@
 ENDIF(NOT CMAKE_RANLIB)
 MARK_AS_ADVANCED(CMAKE_RANLIB)
 
+# used in cpack
+FIND_PROGRAM(CMAKE_STRIP_COMMAND NAMES ${CMAKE_TOOLCHAIN_PREFIX}strip PATHS ${CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
+FIND_PROGRAM(CMAKE_STRIP_COMMAND NAMES ${CMAKE_TOOLCHAIN_PREFIX}strip)
+MARK_AS_ADVANCED(CMAKE_STRIP_COMMAND)
+
+# maybe check for more tools from binutils here ?
+
 # some exotic compilers have different extensions (e.g. sdcc uses .rel)
 # so don't overwrite it if it has been already defined by the user
 IF(NOT CMAKE_C_OUTPUT_EXTENSION)