diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2019-07-26 16:01:15 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-26 12:01:27 -0400 |
| commit | 618bd463ad853da9cd4594bc1ff08fb272a7450d (patch) | |
| tree | a5b49ba0de0ce6d1de0663af9ee874cbed6aa4c9 /Source/cmSystemTools.cxx | |
| parent | af3278af3612e9bc0599617767047eaeb186c998 (diff) | |
| parent | bd2793b6e90c9c990a3cd4db260503e19e9a8ae0 (diff) | |
| download | cmake-618bd463ad853da9cd4594bc1ff08fb272a7450d.tar.gz | |
Merge topic 'remove_compiler_rpath'
bd2793b6e9 Help: Add documentation for INSTALL_REMOVE_ENVIROMENT_RPATH
f08dcbffec Property: Add INSTALL_REMOVE_ENVIROMENT_RPATH property
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3544
Diffstat (limited to 'Source/cmSystemTools.cxx')
| -rw-r--r-- | Source/cmSystemTools.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index e82475764c..3ba3640d3b 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -2367,7 +2367,8 @@ struct cmSystemToolsRPathInfo #if defined(CMAKE_USE_ELF_PARSER) bool cmSystemTools::ChangeRPath(std::string const& file, std::string const& oldRPath, - std::string const& newRPath, std::string* emsg, + std::string const& newRPath, + bool removeEnvironmentRPath, std::string* emsg, bool* changed) { if (changed) { @@ -2454,7 +2455,9 @@ bool cmSystemTools::ChangeRPath(std::string const& file, // Construct the new value which preserves the part of the path // not being changed. - rp[rp_count].Value = se[i]->Value.substr(0, prefix_len); + if (!removeEnvironmentRPath) { + rp[rp_count].Value = se[i]->Value.substr(0, prefix_len); + } rp[rp_count].Value += newRPath; rp[rp_count].Value += se[i]->Value.substr(pos + oldRPath.length()); @@ -2540,6 +2543,7 @@ bool cmSystemTools::ChangeRPath(std::string const& file, bool cmSystemTools::ChangeRPath(std::string const& /*file*/, std::string const& /*oldRPath*/, std::string const& /*newRPath*/, + bool /*removeEnvironmentRPath*/, std::string* /*emsg*/, bool* /*changed*/) { return false; |