summaryrefslogtreecommitdiffstats
path: root/Source/cmInstallTargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-07-08 17:03:47 (GMT)
committerBrad King <brad.king@kitware.com>2009-07-08 17:03:47 (GMT)
commita3a046643aeb6244ac71a3cd645239099c6345f3 (patch)
treec6fc86af7356909f5b29d939ce89cf4235cc1da0 /Source/cmInstallTargetGenerator.cxx
parent6ef56f777803ac6e90699a12636d0133b94b9312 (diff)
downloadCMake-a3a046643aeb6244ac71a3cd645239099c6345f3.zip
CMake-a3a046643aeb6244ac71a3cd645239099c6345f3.tar.gz
CMake-a3a046643aeb6244ac71a3cd645239099c6345f3.tar.bz2
ENH: Pass config to cmTarget RPATH install methods
This passes the build configuration to cmTarget methods IsChrpathUsed and NeedRelinkBeforeInstall. Later these methods will use the value.
Diffstat (limited to 'Source/cmInstallTargetGenerator.cxx')
-rw-r--r--Source/cmInstallTargetGenerator.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index dc3b139..44f3b04 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -69,7 +69,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
{
// Compute the build tree directory from which to copy the target.
std::string fromDirConfig;
- if(this->Target->NeedRelinkBeforeInstall())
+ if(this->Target->NeedRelinkBeforeInstall(config))
{
fromDirConfig = this->Target->GetMakefile()->GetStartOutputDirectory();
fromDirConfig += cmake::GetCMakeFilesDirectory();
@@ -529,7 +529,7 @@ cmInstallTargetGenerator
const char* config, std::string const& toDestDirPath)
{
// Skip the chrpath if the target does not need it.
- if(this->ImportLibrary || !this->Target->IsChrpathUsed())
+ if(this->ImportLibrary || !this->Target->IsChrpathUsed(config))
{
return;
}
@@ -560,7 +560,7 @@ cmInstallTargetGenerator
const char* config, std::string const& toDestDirPath)
{
// Skip the chrpath if the target does not need it.
- if(this->ImportLibrary || !this->Target->IsChrpathUsed())
+ if(this->ImportLibrary || !this->Target->IsChrpathUsed(config))
{
return;
}