[cmake-commits] alex committed CMakeGenericSystem.cmake 1.13 1.13.4.1 CPack.cmake 1.26.4.1 1.26.4.2

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-CrossCompileBasic
	CMakeGenericSystem.cmake CPack.cmake 
Log Message:

ENH: move stripping from cpack to cmake/install time, fully configurable via
the CMAKE_STRIP_FILE rule, currently only implemented for the GNU toolchain.
Now cpack should work also for cross compiling (since it doesn't have to
know the executable suffix anymore).

stripping can be enabled/disabled via the cache variable CMAKE_INSTALL_DO_STRIP.

Even if this is disabled, the cmake_install.cmake files still contain the
strip rules, so by running cmake -DCMAKE_INSTALL_DO_STRIP=1
cmake_install.cmake you can install with stripping also in this case.

Alex


Index: CMakeGenericSystem.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeGenericSystem.cmake,v
retrieving revision 1.13
retrieving revision 1.13.4.1
diff -u -d -r1.13 -r1.13.4.1
--- CMakeGenericSystem.cmake	16 Oct 2006 17:58:17 -0000	1.13
+++ CMakeGenericSystem.cmake	14 May 2007 20:28:07 -0000	1.13.4.1
@@ -73,6 +73,8 @@
     CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
 ENDIF(UNIX)
 
+SET(CMAKE_INSTALL_DO_STRIP FALSE CACHE BOOL "If set to true, executables and libraries will be stripped when installing.")
+
 MARK_AS_ADVANCED(
   CMAKE_SKIP_RPATH
   CMAKE_VERBOSE_MAKEFILE

Index: CPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.cmake,v
retrieving revision 1.26.4.1
retrieving revision 1.26.4.2
diff -u -d -r1.26.4.1 -r1.26.4.2
--- CPack.cmake	11 May 2007 17:06:55 -0000	1.26.4.1
+++ CPack.cmake	14 May 2007 20:28:07 -0000	1.26.4.2
@@ -55,11 +55,8 @@
   "${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_DO_STRIP "${CMAKE_INSTALL_DO_STRIP}")  
 
 cpack_set_if_not_set(CPACK_MODULE_PATH "${CMAKE_MODULE_PATH}")