diff options
author | Brad King <brad.king@kitware.com> | 2008-03-02 19:35:23 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2008-03-02 19:35:23 (GMT) |
commit | d732de4a8a189699135e67f8bad66757bdcf188f (patch) | |
tree | a18672b2681d61fd62d3be37cb9166ab3fe50290 /Source/cmComputeLinkInformation.cxx | |
parent | 16a415dd0c81a4a11cf6fa78755ce636e5ac3ab9 (diff) | |
download | CMake-d732de4a8a189699135e67f8bad66757bdcf188f.zip CMake-d732de4a8a189699135e67f8bad66757bdcf188f.tar.gz CMake-d732de4a8a189699135e67f8bad66757bdcf188f.tar.bz2 |
ENH: Cleanup builtin chrpath support
- Move computation of extended build-tree rpath
to cmComputeLinkInformation
- Only enable the extended build-tree rpath if
the target will be installed
- Generalize the interface of file(CHRPATH)
- When changing the rpath on installation only
replace the part generated by CMake because
the native tools (ex SunCC on Linux) might have
added their own part to the rpath
Diffstat (limited to 'Source/cmComputeLinkInformation.cxx')
-rw-r--r-- | Source/cmComputeLinkInformation.cxx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index 554d8de..a3f8bab 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -1463,6 +1463,18 @@ std::string cmComputeLinkInformation::GetRPathString(bool for_install) // Add this path. rpath += *ri; } + + // If the rpath will be replaced at install time make sure it is + // long enough now. + if(!for_install && this->RuntimeUseChrpath) + { + std::string::size_type minLength = this->GetChrpathString().length(); + while(rpath.length() < minLength) + { + rpath += this->GetRuntimeSep(); + } + } + return rpath; } |