diff options
| author | Brad King <brad.king@kitware.com> | 2008-03-02 21:19:26 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-03-02 21:19:26 (GMT) |
| commit | 34a338dcc13c520270d5e74ee8a9c953c9724d85 (patch) | |
| tree | 203dbcd867bd7888424e7052bb4eacc8b7c98e0b /Source | |
| parent | d732de4a8a189699135e67f8bad66757bdcf188f (diff) | |
| download | CMake-34a338dcc13c520270d5e74ee8a9c953c9724d85.zip CMake-34a338dcc13c520270d5e74ee8a9c953c9724d85.tar.gz CMake-34a338dcc13c520270d5e74ee8a9c953c9724d85.tar.bz2 | |
ENH: In cmSystemTools::ChangeRPath check for the RUNPATH if RPATH does not exist.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmSystemTools.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index dbcf775..d4dee28 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -2208,7 +2208,12 @@ bool cmSystemTools::ChangeRPath(std::string const& file, 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() || |