diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2019-07-26 16:01:15 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-26 16:01:27 (GMT) |
| commit | 618bd463ad853da9cd4594bc1ff08fb272a7450d (patch) | |
| tree | a5b49ba0de0ce6d1de0663af9ee874cbed6aa4c9 /Source/cmFileCommand.cxx | |
| parent | af3278af3612e9bc0599617767047eaeb186c998 (diff) | |
| parent | bd2793b6e90c9c990a3cd4db260503e19e9a8ae0 (diff) | |
| download | CMake-618bd463ad853da9cd4594bc1ff08fb272a7450d.zip CMake-618bd463ad853da9cd4594bc1ff08fb272a7450d.tar.gz CMake-618bd463ad853da9cd4594bc1ff08fb272a7450d.tar.bz2 | |
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/cmFileCommand.cxx')
| -rw-r--r-- | Source/cmFileCommand.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 1c40753..a8ee6a8 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -1071,6 +1071,7 @@ bool cmFileCommand::HandleRPathChangeCommand( std::string file; const char* oldRPath = nullptr; const char* newRPath = nullptr; + bool removeEnvironmentRPath = false; enum Doing { DoingNone, @@ -1086,6 +1087,8 @@ bool cmFileCommand::HandleRPathChangeCommand( doing = DoingNew; } else if (args[i] == "FILE") { doing = DoingFile; + } else if (args[i] == "INSTALL_REMOVE_ENVIRONMENT_RPATH") { + removeEnvironmentRPath = true; } else if (doing == DoingFile) { file = args[i]; doing = DoingNone; @@ -1124,7 +1127,9 @@ bool cmFileCommand::HandleRPathChangeCommand( cmFileTimes const ft(file); std::string emsg; bool changed; - if (!cmSystemTools::ChangeRPath(file, oldRPath, newRPath, &emsg, &changed)) { + + if (!cmSystemTools::ChangeRPath(file, oldRPath, newRPath, + removeEnvironmentRPath, &emsg, &changed)) { std::ostringstream e; /* clang-format off */ e << "RPATH_CHANGE could not write new RPATH:\n" |