diff options
| author | Chuck Atkins <chuck.atkins@kitware.com> | 2015-08-07 19:11:57 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-08-13 14:34:44 (GMT) |
| commit | 675ef165f213a6db1f9d0dfbebf6a0afc5469494 (patch) | |
| tree | 79fa37f2fd5a783478610ea72f8b524883c4d4fd /Source | |
| parent | 7a7922e0201fee6a6f45c702f96ca57a295c68fe (diff) | |
| download | CMake-675ef165f213a6db1f9d0dfbebf6a0afc5469494.zip CMake-675ef165f213a6db1f9d0dfbebf6a0afc5469494.tar.gz CMake-675ef165f213a6db1f9d0dfbebf6a0afc5469494.tar.bz2 | |
Allow LINK_SEARCH_{START,END}_STATIC props to have default values.
Use the CMAKE_LINK_SEARCH_START_STATIC and CMAKE_LINK_SEARCH_END_STATIC
variables to initialize the LINK_SEARCH_START_STATIC and
LINK_SEARCH_END_STATIC target properties respectively.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 8 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index c16472e..12dddd2 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -522,9 +522,10 @@ bool cmComputeLinkInformation::Compute() // libraries are found. const char* lss = this->Target->Target->GetProperty("LINK_SEARCH_END_STATIC"); - if(cmSystemTools::IsOn(lss)) + if(lss) { - this->SetCurrentLinkType(LinkStatic); + this->SetCurrentLinkType( + cmSystemTools::IsOn(lss) ? LinkStatic : LinkShared); } else { @@ -862,7 +863,8 @@ void cmComputeLinkInformation::ComputeLinkTypeInfo() const char* lss = this->Target->Target->GetProperty("LINK_SEARCH_START_STATIC"); this->StartLinkType = cmSystemTools::IsOn(lss)? LinkStatic : LinkShared; - this->CurrentLinkType = this->StartLinkType; + this->CurrentLinkType = LinkUnknown; + this->SetCurrentLinkType(this->StartLinkType); } //---------------------------------------------------------------------------- diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 316d85c..59d4da0 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -306,6 +306,8 @@ void cmTarget::SetMakefile(cmMakefile* mf) this->SetPropertyDefault("CXX_STANDARD", 0); this->SetPropertyDefault("CXX_STANDARD_REQUIRED", 0); this->SetPropertyDefault("CXX_EXTENSIONS", 0); + this->SetPropertyDefault("LINK_SEARCH_START_STATIC", 0); + this->SetPropertyDefault("LINK_SEARCH_END_STATIC", 0); } // Collect the set of configuration types. |