diff options
author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-07-14 01:00:00 (GMT) |
---|---|---|
committer | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-07-14 12:22:24 (GMT) |
commit | 715691124240b696c8be1d7cd6ce6dbb09381c67 (patch) | |
tree | 85829a543a5d041e7329ae2e447b3d261ea640b8 /Source/cmGlobalGenerator.cxx | |
parent | 2da778664d3e99ada4e67a5a1b9d377f92a9f75f (diff) | |
download | CMake-715691124240b696c8be1d7cd6ce6dbb09381c67.zip CMake-715691124240b696c8be1d7cd6ce6dbb09381c67.tar.gz CMake-715691124240b696c8be1d7cd6ce6dbb09381c67.tar.bz2 |
cmIsOn: add overload accepting const std::string*
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
-rw-r--r-- | Source/cmGlobalGenerator.cxx | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index a0cee0e..49b73a8 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -304,14 +304,10 @@ bool cmGlobalGenerator::CheckTargetsForMissingSources() const for (const auto& target : localGen->GetGeneratorTargets()) { if (target->GetType() == cmStateEnums::TargetType::GLOBAL_TARGET || target->GetType() == cmStateEnums::TargetType::INTERFACE_LIBRARY || - target->GetType() == cmStateEnums::TargetType::UTILITY) { + target->GetType() == cmStateEnums::TargetType::UTILITY || + cmIsOn(target->GetProperty("ghs_integrity_app"))) { continue; } - if (cmProp p = target->GetProperty("ghs_integrity_app")) { - if (cmIsOn(*p)) { - continue; - } - } std::vector<std::string> configs = target->Makefile->GetGeneratorConfigs(cmMakefile::IncludeEmptyConfig); @@ -374,14 +370,10 @@ bool cmGlobalGenerator::CheckTargetsForPchCompilePdb() const for (const auto& target : generator->GetGeneratorTargets()) { if (target->GetType() == cmStateEnums::TargetType::GLOBAL_TARGET || target->GetType() == cmStateEnums::TargetType::INTERFACE_LIBRARY || - target->GetType() == cmStateEnums::TargetType::UTILITY) { + target->GetType() == cmStateEnums::TargetType::UTILITY || + cmIsOn(target->GetProperty("ghs_integrity_app"))) { continue; } - if (cmProp p = target->GetProperty("ghs_integrity_app")) { - if (cmIsOn(*p)) { - continue; - } - } std::string const& reuseFrom = target->GetSafeProperty("PRECOMPILE_HEADERS_REUSE_FROM"); |