[cmake-commits] alex committed cmInstallTargetGenerator.cxx 1.32 1.33

cmake-commits at cmake.org cmake-commits at cmake.org
Fri May 18 11:57:31 EDT 2007


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

Modified Files:
	cmInstallTargetGenerator.cxx 
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: cmInstallTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallTargetGenerator.cxx,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- cmInstallTargetGenerator.cxx	18 May 2007 12:49:06 -0000	1.32
+++ cmInstallTargetGenerator.cxx	18 May 2007 15:57:29 -0000	1.33
@@ -349,14 +349,6 @@
   std::string installNameTool =
     this->Target->GetMakefile()->GetSafeDefinition("CMAKE_INSTALL_NAME_TOOL");
   
-  // hack: if a new cmake runs on an old build tree, CMAKE_INSTALL_NAME_TOOL
-  // isn't in the cache, because it was simply hardcoded. To make this work
-  // adjust it here.
-  if((this->Target->GetMakefile()->IsOn("APPLE")) && (!installNameTool.size()))
-    {
-    installNameTool = "install_name_tool";
-    }
-
   if(!installNameTool.size())
     {
     return;



More information about the Cmake-commits mailing list