summaryrefslogtreecommitdiffstats
path: root/Source/cmTarget.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-07-08 17:04:04 (GMT)
committerBrad King <brad.king@kitware.com>2009-07-08 17:04:04 (GMT)
commit173448d9886deccb7cadd4fd0ffeaa236fa66e49 (patch)
tree12ef68b6607c5b223cd5e962d2e63d3ba8e68b69 /Source/cmTarget.cxx
parenta3a046643aeb6244ac71a3cd645239099c6345f3 (diff)
downloadCMake-173448d9886deccb7cadd4fd0ffeaa236fa66e49.zip
CMake-173448d9886deccb7cadd4fd0ffeaa236fa66e49.tar.gz
CMake-173448d9886deccb7cadd4fd0ffeaa236fa66e49.tar.bz2
ENH: Pass config to cmTarget::GetLinkerLanguage
This passes the build configuration to most GetLinkerLanguage calls. In the future the linker language will account for targets linked in each configuration.
Diffstat (limited to 'Source/cmTarget.cxx')
-rw-r--r--Source/cmTarget.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 4003190..32c1688 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2320,7 +2320,7 @@ bool cmTarget::GetPropertyAsBool(const char* prop)
}
//----------------------------------------------------------------------------
-const char* cmTarget::GetLinkerLanguage()
+const char* cmTarget::GetLinkerLanguage(const char*)
{
cmGlobalGenerator* gg =
this->Makefile->GetLocalGenerator()->GetGlobalGenerator();
@@ -2772,7 +2772,7 @@ void cmTarget::GetLibraryNames(std::string& name,
}
// Construct the name of the soname flag variable for this language.
- const char* ll = this->GetLinkerLanguage();
+ const char* ll = this->GetLinkerLanguage(config);
std::string sonameFlag = "CMAKE_SHARED_LIBRARY_SONAME";
if(ll)
{
@@ -3062,7 +3062,7 @@ bool cmTarget::NeedRelinkBeforeInstall(const char* config)
}
// Check for rpath support on this platform.
- if(const char* ll = this->GetLinkerLanguage())
+ if(const char* ll = this->GetLinkerLanguage(config))
{
std::string flagVar = "CMAKE_SHARED_LIBRARY_RUNTIME_";
flagVar += ll;
@@ -3387,7 +3387,7 @@ bool cmTarget::IsChrpathUsed(const char* config)
// Enable if the rpath flag uses a separator and the target uses ELF
// binaries.
- if(const char* ll = this->GetLinkerLanguage())
+ if(const char* ll = this->GetLinkerLanguage(config))
{
std::string sepVar = "CMAKE_SHARED_LIBRARY_RUNTIME_";
sepVar += ll;