summaryrefslogtreecommitdiffstats
path: root/Source/cmComputeLinkInformation.cxx
diff options
context:
space:
mode:
authorVitaly Stakhovsky <vvs31415@gitlab.org>2020-07-14 01:00:00 (GMT)
committerVitaly Stakhovsky <vvs31415@gitlab.org>2020-07-14 12:22:24 (GMT)
commit715691124240b696c8be1d7cd6ce6dbb09381c67 (patch)
tree85829a543a5d041e7329ae2e447b3d261ea640b8 /Source/cmComputeLinkInformation.cxx
parent2da778664d3e99ada4e67a5a1b9d377f92a9f75f (diff)
downloadCMake-715691124240b696c8be1d7cd6ce6dbb09381c67.zip
CMake-715691124240b696c8be1d7cd6ce6dbb09381c67.tar.gz
CMake-715691124240b696c8be1d7cd6ce6dbb09381c67.tar.bz2
cmIsOn: add overload accepting const std::string*
Diffstat (limited to 'Source/cmComputeLinkInformation.cxx')
-rw-r--r--Source/cmComputeLinkInformation.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 5efa365..fbb95e1 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -515,7 +515,7 @@ bool cmComputeLinkInformation::Compute()
// Restore the target link type so the correct system runtime
// libraries are found.
cmProp lss = this->Target->GetProperty("LINK_SEARCH_END_STATIC");
- if (lss && cmIsOn(*lss)) {
+ if (cmIsOn(lss)) {
this->SetCurrentLinkType(LinkStatic);
} else {
this->SetCurrentLinkType(this->StartLinkType);
@@ -841,7 +841,7 @@ void cmComputeLinkInformation::ComputeLinkTypeInfo()
// Lookup the starting link type from the target (linked statically?).
cmProp lss = this->Target->GetProperty("LINK_SEARCH_START_STATIC");
- this->StartLinkType = (lss && cmIsOn(*lss)) ? LinkStatic : LinkShared;
+ this->StartLinkType = cmIsOn(lss) ? LinkStatic : LinkShared;
this->CurrentLinkType = this->StartLinkType;
}