summaryrefslogtreecommitdiffstats
path: root/Source/cmInstallTargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2008-03-01 17:51:07 (GMT)
committerBrad King <brad.king@kitware.com>2008-03-01 17:51:07 (GMT)
commit34c76d4304064d7d0e28ceaeee8ba4048497215a (patch)
tree1fe059dba6b66836c39b0e2b2c0d622a78b5c981 /Source/cmInstallTargetGenerator.cxx
parent61178a0682a024e03e6fe41897b40bb096611f7a (diff)
downloadCMake-34c76d4304064d7d0e28ceaeee8ba4048497215a.zip
CMake-34c76d4304064d7d0e28ceaeee8ba4048497215a.tar.gz
CMake-34c76d4304064d7d0e28ceaeee8ba4048497215a.tar.bz2
ENH: Use builtin chrpath instead of relinking ELF targets
- Add cmSystemTools::ChangeRPath method - Add undocumented file(CHRPATH) command - When installing use file(CHRPATH) to change the rpath instead of relinking - Remove CMAKE_CHRPATH lookup from CMakeFindBinUtils - Remove CMAKE_USE_CHRPATH option since this should always work
Diffstat (limited to 'Source/cmInstallTargetGenerator.cxx')
-rw-r--r--Source/cmInstallTargetGenerator.cxx7
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index c8e00d5..c2d606e 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -576,12 +576,9 @@ cmInstallTargetGenerator
// Get the install RPATH from the link information.
std::string newRpath = cli->GetChrpathString();
- // Fix the RPATH in installed ELF binaries using chrpath.
- std::string chrpathTool = cli->GetChrpathTool();
-
// Write a rule to run chrpath to set the install-tree RPATH
- os << indent << "EXECUTE_PROCESS(COMMAND \"" << chrpathTool;
- os << "\" -r \"" << newRpath << "\" \"" << toDestDirPath << "\")\n";
+ os << indent
+ << "FILE(CHRPATH \"" << toDestDirPath << "\" \"" << newRpath << "\")\n";
}
//----------------------------------------------------------------------------