summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalGenerator.h
diff options
context:
space:
mode:
authorClinton Stimpson <clinton@elemtech.com>2014-02-02 04:18:04 (GMT)
committerClinton Stimpson <clinton@elemtech.com>2014-02-03 14:04:54 (GMT)
commit028a5285d8ff5053fc96ea9840cb341bdf636e24 (patch)
treebdf44e70945eb207b0f61f38ace628029fed8f5b /Source/cmGlobalGenerator.h
parent6385c7151631a4ac72490540fe75cb0b9ebbedf5 (diff)
downloadCMake-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.h')
-rw-r--r--Source/cmGlobalGenerator.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index ebc2db5..753eebf 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -193,6 +193,10 @@ public:
///! What is the configurations directory variable called?
virtual const char* GetCMakeCFGIntDir() const { return "."; }
+ ///! expand CFGIntDir for a configuration
+ virtual std::string ExpandCFGIntDir(const std::string& str,
+ const std::string& config) const;
+
/** Get whether the generator should use a script for link commands. */
bool GetUseLinkScript() const { return this->UseLinkScript; }