From 26e58b74d1e1c6311ca9ff159decb29d8bd7007e Mon Sep 17 00:00:00 2001 From: Brad King Date: Sat, 1 Mar 2008 13:17:01 -0500 Subject: [PATCH] BUG: Fix cmSystemTools::ChangeRPath to not complain if there is no RPATH entry in the file but the requested new rpath is empty. --- Source/cmSystemTools.cxx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 1842317e92..4c15df7fe6 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -2211,6 +2211,12 @@ bool cmSystemTools::ChangeRPath(std::string const& file, 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)