[cmake-commits] alex committed Darwin.cmake 1.30 1.31

[cmake-commits at cmake.org]

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

Modified Files:
	Darwin.cmake 
Log Message:
ENH: move hack to fix "new cmake on old build tree on OSX doesn't have CMAKE_INSTALL_NAME_TOOL in the cache" from 
cmInstallTargetGenerator.cxx to Darwin.cmake

Alex



Index: Darwin.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Darwin.cmake,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- Darwin.cmake	8 May 2007 14:32:53 -0000	1.30
+++ Darwin.cmake	18 May 2007 15:57:29 -0000	1.31
@@ -13,6 +13,15 @@
 SET(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
 SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
 
+# hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
+# (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
+# and still cmake didn't fail in CMakeFindBinUtils.cmake (because it isn't rerun)
+# hardcode CMAKE_INSTALL_NAME_TOOL here to install_name_tool, so it behaves as it did before, Alex
+IF(NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
+  SET(CMAKE_INSTALL_NAME_TOOL install_name_tool)
+ENDIF(NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
+
+
 # setup for universal binaries if sysroot exists
 IF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
   # set the sysroot to be used if CMAKE_OSX_ARCHITECTURES