[cmake-commits] king committed cmSystemTools.cxx 1.364 1.365

[cmake-commits at cmake.org]

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

Modified Files:
	cmSystemTools.cxx 
Log Message:
BUG: Fix cmSystemTools::ChangeRPath to not complain if there is no RPATH entry in the file but the requested new rpath is empty.


Index: cmSystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSystemTools.cxx,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -d -r1.364 -r1.365
--- cmSystemTools.cxx	1 Mar 2008 17:51:07 -0000	1.364
+++ cmSystemTools.cxx	1 Mar 2008 18:17:01 -0000	1.365
@@ -2211,6 +2211,12 @@
     rpathPosition = se->Position;
     rpathSize = se->Size;
     }
+  else if(newRPath.empty())
+    {
+    // The new rpath is empty and there is no rpath anyway so it is
+    // okay.
+    return true;
+    }
   else
     {
     if(emsg)