[cmake-commits] alex committed cmInstallTargetGenerator.cxx 1.28 1.28.2.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-CrossCompileBasic
	cmInstallTargetGenerator.cxx 
Log Message:

ENH: -added new CMakeFindBinUtils.cmake to have less code duplication in
CMakeDetermineC/C++?FortranCompiler.cmake, 
-added CMAKE_INSTALL_NAME_TOOL variable, only run install_name_tool handling
if this was found

Alex


Index: cmInstallTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallTargetGenerator.cxx,v
retrieving revision 1.28
retrieving revision 1.28.2.1
diff -u -d -r1.28 -r1.28.2.1
--- cmInstallTargetGenerator.cxx	19 Mar 2007 14:00:35 -0000	1.28
+++ cmInstallTargetGenerator.cxx	14 May 2007 15:08:00 -0000	1.28.2.1
@@ -171,9 +171,10 @@
                        no_rename, literal_args.c_str());
 
   // Fix the install_name settings in installed binaries.
-  if(type == cmTarget::SHARED_LIBRARY ||
+  if((type == cmTarget::SHARED_LIBRARY ||
      type == cmTarget::MODULE_LIBRARY ||
-     type == cmTarget::EXECUTABLE)
+     type == cmTarget::EXECUTABLE) &&
+     this->Target->GetMakefile()->IsSet("CMAKE_INSTALL_NAME_TOOL"))
     {
     this->AddInstallNamePatchRule(os, destination.c_str());
     }
@@ -417,7 +418,8 @@
     component_test += this->Component;
     component_test += ")$\"";
     os << "IF(" << component_test << ")\n";
-    os << "  EXECUTE_PROCESS(COMMAND install_name_tool";
+    os << "  EXECUTE_PROCESS(COMMAND ";
+    os <<this->Target->GetMakefile()->GetDefinition("CMAKE_INSTALL_NAME_TOOL");
     if(!new_id.empty())
       {
       os << "\n    -id \"" << new_id << "\"";