diff options
| author | Brad King <brad.king@kitware.com> | 2008-03-01 18:17:01 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-03-01 18:17:01 (GMT) |
| commit | 26e58b74d1e1c6311ca9ff159decb29d8bd7007e (patch) | |
| tree | 5f001add0b0ec0008aadbb103c3a97891d00c1ef /Source/cmSystemTools.cxx | |
| parent | 59001281bb917c436c3ec03301769a863d60985a (diff) | |
| download | CMake-26e58b74d1e1c6311ca9ff159decb29d8bd7007e.zip CMake-26e58b74d1e1c6311ca9ff159decb29d8bd7007e.tar.gz CMake-26e58b74d1e1c6311ca9ff159decb29d8bd7007e.tar.bz2 | |
BUG: Fix cmSystemTools::ChangeRPath to not complain if there is no RPATH entry in the file but the requested new rpath is empty.
Diffstat (limited to 'Source/cmSystemTools.cxx')
| -rw-r--r-- | Source/cmSystemTools.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 1842317..4c15df7 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) |