[cmake-commits] king committed CMakeFindBinUtils.cmake 1.14 1.15

cmake-commits at cmake.org cmake-commits at cmake.org
Sat Mar 1 12:51:09 EST 2008


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

Modified Files:
	CMakeFindBinUtils.cmake 
Log Message:
ENH: Use builtin chrpath instead of relinking ELF targets

  - Add cmSystemTools::ChangeRPath method
  - Add undocumented file(CHRPATH) command
  - When installing use file(CHRPATH) to change the rpath
    instead of relinking
  - Remove CMAKE_CHRPATH lookup from CMakeFindBinUtils
  - Remove CMAKE_USE_CHRPATH option since this should
    always work


Index: CMakeFindBinUtils.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFindBinUtils.cmake,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- CMakeFindBinUtils.cmake	22 Jan 2008 01:57:23 -0000	1.14
+++ CMakeFindBinUtils.cmake	1 Mar 2008 17:51:07 -0000	1.15
@@ -74,16 +74,3 @@
 
   MARK_AS_ADVANCED(CMAKE_INSTALL_NAME_TOOL)
 ENDIF(APPLE)
-
-# if we are on an ELF system, search for chrpath
-# according to the binutils mailing list chrpath has problems when cross compiling
-# i.e. if the target has different endianness than the host
-IF("${CMAKE_EXECUTABLE_FORMAT}" STREQUAL "ELF"  AND NOT  CMAKE_CROSSCOMPILING)
-  # on ELF platforms there might be chrpath, which works similar to install_name_tool
-  OPTION(CMAKE_USE_CHRPATH "Enable this to use chrpath if available" OFF)
-
-  FIND_PROGRAM(CMAKE_CHRPATH chrpath PATHS ${_CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
-  FIND_PROGRAM(CMAKE_CHRPATH chrpath)
-
-  MARK_AS_ADVANCED(CMAKE_CHRPATH CMAKE_USE_CHRPATH)
-ENDIF("${CMAKE_EXECUTABLE_FORMAT}" STREQUAL "ELF"  AND NOT  CMAKE_CROSSCOMPILING)



More information about the Cmake-commits mailing list