summaryrefslogtreecommitdiffstats
path: root/Source/cmTarget.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/cmTarget.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/cmTarget.cxx')
-rw-r--r--Source/cmTarget.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 58cf24e..4003190 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -3025,7 +3025,7 @@ bool cmTarget::HaveInstallTreeRPATH()
}
//----------------------------------------------------------------------------
-bool cmTarget::NeedRelinkBeforeInstall()
+bool cmTarget::NeedRelinkBeforeInstall(const char* config)
{
// Only executables and shared libraries can have an rpath and may
// need relinking.
@@ -3056,7 +3056,7 @@ bool cmTarget::NeedRelinkBeforeInstall()
}
// If chrpath is going to be used no relinking is needed.
- if(this->IsChrpathUsed())
+ if(this->IsChrpathUsed(config))
{
return false;
}
@@ -3349,7 +3349,7 @@ void cmTarget::GetLanguages(std::set<cmStdString>& languages) const
}
//----------------------------------------------------------------------------
-bool cmTarget::IsChrpathUsed()
+bool cmTarget::IsChrpathUsed(const char* config)
{
#if defined(CMAKE_USE_ELF_PARSER)
// Only certain target types have an rpath.
@@ -3405,6 +3405,7 @@ bool cmTarget::IsChrpathUsed()
}
}
#endif
+ static_cast<void>(config);
return false;
}