diff options
| author | Brad King <brad.king@kitware.com> | 2022-05-19 13:41:46 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-05-19 13:41:52 (GMT) |
| commit | f808b19020b3225b314a74fa3be65ea74b3c024f (patch) | |
| tree | 6705c4e624fe26ac14b844d9b76a38ce318104e1 /Source | |
| parent | 3c1c369b36ea4d9d90f1c3f22ac47a473067fd09 (diff) | |
| parent | 259c2651126d3087ddf377569de912a7f42e68f0 (diff) | |
| download | CMake-f808b19020b3225b314a74fa3be65ea74b3c024f.zip CMake-f808b19020b3225b314a74fa3be65ea74b3c024f.tar.gz CMake-f808b19020b3225b314a74fa3be65ea74b3c024f.tar.bz2 | |
Merge topic 'verify-interface-header-sets'
259c265112 VERIFY_HEADER_SETS: Rename to VERIFY_INTERFACE_HEADER_SETS
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7279
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 10 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index d8a7c39..d852b48 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -8527,7 +8527,7 @@ cmGeneratorTarget::ManagedType cmGeneratorTarget::GetManagedType( bool cmGeneratorTarget::AddHeaderSetVerification() { - if (!this->GetPropertyAsBool("VERIFY_HEADER_SETS")) { + if (!this->GetPropertyAsBool("VERIFY_INTERFACE_HEADER_SETS")) { return true; } @@ -8601,7 +8601,7 @@ bool cmGeneratorTarget::AddHeaderSetVerification() cmMakefile::PolicyPushPop polScope(this->Makefile); this->Makefile->SetPolicy(cmPolicies::CMP0119, cmPolicies::NEW); verifyTarget = this->Makefile->AddLibrary( - cmStrCat(this->GetName(), "_verify_header_sets"), + cmStrCat(this->GetName(), "_verify_interface_header_sets"), cmStateEnums::OBJECT_LIBRARY, {}, true); } @@ -8682,9 +8682,9 @@ std::string cmGeneratorTarget::GenerateHeaderSetVerificationFile( } headerFilename += source.GetLocation().GetName(); - auto filename = cmStrCat(this->LocalGenerator->GetCurrentBinaryDirectory(), - '/', this->GetName(), "_verify_header_sets/", - headerFilename, extension); + auto filename = cmStrCat( + this->LocalGenerator->GetCurrentBinaryDirectory(), '/', this->GetName(), + "_verify_interface_header_sets/", headerFilename, extension); auto* verificationSource = this->Makefile->GetOrCreateSource(filename); verificationSource->SetProperty("LANGUAGE", language); diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 80d1940..83dc1c2 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -621,7 +621,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type, } initProp("FOLDER"); - initProp("VERIFY_HEADER_SETS"); + initProp("VERIFY_INTERFACE_HEADER_SETS"); if (this->GetGlobalGenerator()->IsXcode()) { initProp("XCODE_GENERATE_SCHEME"); |