diff options
| author | Brad King <brad.king@kitware.com> | 2019-08-19 19:03:41 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-08-19 19:03:53 (GMT) |
| commit | 0f914b7f26b80163c86cd07959d0f32912ce2fcc (patch) | |
| tree | 071a4f3958785ae75913221ac77c9a2bec8305e4 /Source/cmComputeLinkInformation.cxx | |
| parent | e977867a1245309b7fbd0e3faaff26c68087f491 (diff) | |
| parent | 3b6c62be238f48b23d7dad302702f723dc5ef89c (diff) | |
| download | CMake-0f914b7f26b80163c86cd07959d0f32912ce2fcc.zip CMake-0f914b7f26b80163c86cd07959d0f32912ce2fcc.tar.gz CMake-0f914b7f26b80163c86cd07959d0f32912ce2fcc.tar.bz2 | |
Merge topic 'cmStringAlgorithms_IsOn'
3b6c62be23 cmSystemTools: Remove IsInternallyOn, IsNOTFOUND, IsOn, IsOff
20e580be01 Source sweep: Use cmIsOn instead of cmSystemTools::IsOn
5b7650216b cmStringAlgorithms: Add cmIsInternallyOn, cmIsNOTFOUND, cmIsOn, cmIsOff
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3691
Diffstat (limited to 'Source/cmComputeLinkInformation.cxx')
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index 5f5317c..4273383 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -480,7 +480,7 @@ bool cmComputeLinkInformation::Compute() // Restore the target link type so the correct system runtime // libraries are found. const char* lss = this->Target->GetProperty("LINK_SEARCH_END_STATIC"); - if (cmSystemTools::IsOn(lss)) { + if (cmIsOn(lss)) { this->SetCurrentLinkType(LinkStatic); } else { this->SetCurrentLinkType(this->StartLinkType); @@ -787,7 +787,7 @@ void cmComputeLinkInformation::ComputeLinkTypeInfo() // Lookup the starting link type from the target (linked statically?). const char* lss = this->Target->GetProperty("LINK_SEARCH_START_STATIC"); - this->StartLinkType = cmSystemTools::IsOn(lss) ? LinkStatic : LinkShared; + this->StartLinkType = cmIsOn(lss) ? LinkStatic : LinkShared; this->CurrentLinkType = this->StartLinkType; } |