[cmake-commits] king committed cmInstallTargetGenerator.cxx 1.61 1.62

[cmake-commits at cmake.org]

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

Modified Files:
	cmInstallTargetGenerator.cxx 
Log Message:
ENH: During installation do not use builtin chrpath if the rpath will not change.


Index: cmInstallTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallTargetGenerator.cxx,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- cmInstallTargetGenerator.cxx	2 Mar 2008 19:35:23 -0000	1.61
+++ cmInstallTargetGenerator.cxx	2 Mar 2008 21:48:50 -0000	1.62
@@ -572,6 +572,12 @@
   // Get the install RPATH from the link information.
   std::string newRpath = cli->GetChrpathString();
 
+  // Skip the rule if the paths are identical
+  if(oldRpath == newRpath)
+    {
+    return;
+    }
+
   // Write a rule to run chrpath to set the install-tree RPATH
   os << indent << "FILE(CHRPATH FILE \"" << toDestDirPath << "\"\n"
      << indent << "     OLD_RPATH \"" << oldRpath << "\"\n"