diff options
author | Clinton Stimpson <clinton@elemtech.com> | 2014-02-02 04:18:04 (GMT) |
---|---|---|
committer | Clinton Stimpson <clinton@elemtech.com> | 2014-02-03 14:04:54 (GMT) |
commit | 028a5285d8ff5053fc96ea9840cb341bdf636e24 (patch) | |
tree | bdf44e70945eb207b0f61f38ace628029fed8f5b /Source/cmGlobalGenerator.cxx | |
parent | 6385c7151631a4ac72490540fe75cb0b9ebbedf5 (diff) | |
download | CMake-028a5285d8ff5053fc96ea9840cb341bdf636e24.zip CMake-028a5285d8ff5053fc96ea9840cb341bdf636e24.tar.gz CMake-028a5285d8ff5053fc96ea9840cb341bdf636e24.tar.bz2 |
OS X: Make sure RPATHs are unique to avoid possible corruption.
When using link_directories() and including CMAKE_CFG_INTDIR,
one can end up with duplicate RPATHs in the binary which
install_name_tool cannot fix without corrupting the binary.
Also, the cmake_install.cmake file has been fixed to correctly
handle these generator specific variables.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
-rw-r--r-- | Source/cmGlobalGenerator.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 03486d8..a61cab1 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -3032,3 +3032,10 @@ void cmGlobalGenerator::ProcessEvaluationFiles() } } } + +//---------------------------------------------------------------------------- +std::string cmGlobalGenerator::ExpandCFGIntDir(const std::string& str, + const std::string& /*config*/) const +{ + return str; +} |