[cmake-commits] king committed cmSystemTools.cxx 1.367 1.368

[cmake-commits at cmake.org]

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

Modified Files:
	cmSystemTools.cxx 
Log Message:
ENH: In cmSystemTools::ChangeRPath check for the RUNPATH if RPATH does not exist.


Index: cmSystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSystemTools.cxx,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -d -r1.367 -r1.368
--- cmSystemTools.cxx	2 Mar 2008 19:35:23 -0000	1.367
+++ cmSystemTools.cxx	2 Mar 2008 21:19:26 -0000	1.368
@@ -2208,7 +2208,12 @@
   std::string rpathSuffix;
   {
   cmELF elf(file.c_str());
-  if(cmELF::StringEntry const* se = elf.GetRPath())
+  cmELF::StringEntry const* se = elf.GetRPath();
+  if(!se)
+    {
+    se = elf.GetRunPath();
+    }
+  if(se)
     {
     // Make sure the current rpath begins with the old rpath.
     if(se->Value.length() < oldRPath.length() ||