diff options
| author | Brad King <brad.king@kitware.com> | 2021-02-24 14:44:54 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-02-24 14:44:59 (GMT) |
| commit | ab3485d15b2741746c97d1718484a58de03f219d (patch) | |
| tree | 813d8ddcfb2894632050191aef214084a23ee3b2 /Source/cmQtAutoGenGlobalInitializer.cxx | |
| parent | 16a2c0cfa3ba00ade705e88c87824e8d4b5a14bf (diff) | |
| parent | 339dbc901f04369e997d8d65b60380d6255e5f10 (diff) | |
| download | CMake-ab3485d15b2741746c97d1718484a58de03f219d.zip CMake-ab3485d15b2741746c97d1718484a58de03f219d.tar.gz CMake-ab3485d15b2741746c97d1718484a58de03f219d.tar.bz2 | |
Merge topic 'autogen-cmp0116-fix'
339dbc901f Help: Note that CMP0116 is recorded at the time of CC creation
e3740e020e Tests: Test Qt autogen target with CMP0116 set to WARN
cf34011ce7 Tests: Test per-CC behavior of CMP0116
3a95503512 Ninja: Use CMP0116 status recorded at time of custom command's creation
f01f10e8fb cmCustomCommand: Record value of CMP0116 at time of creation
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5848
Diffstat (limited to 'Source/cmQtAutoGenGlobalInitializer.cxx')
| -rw-r--r-- | Source/cmQtAutoGenGlobalInitializer.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmQtAutoGenGlobalInitializer.cxx b/Source/cmQtAutoGenGlobalInitializer.cxx index 62b879f..f79ffd4 100644 --- a/Source/cmQtAutoGenGlobalInitializer.cxx +++ b/Source/cmQtAutoGenGlobalInitializer.cxx @@ -13,6 +13,7 @@ #include "cmLocalGenerator.h" #include "cmMakefile.h" #include "cmMessageType.h" +#include "cmPolicies.h" #include "cmProcessOutput.h" #include "cmProperty.h" #include "cmQtAutoGen.h" @@ -167,9 +168,10 @@ void cmQtAutoGenGlobalInitializer::GetOrCreateGlobalTarget( std::vector<std::string> no_byproducts; std::vector<std::string> no_depends; cmCustomCommandLines no_commands; + const cmPolicies::PolicyStatus cmp0116_new = cmPolicies::NEW; cmTarget* target = localGen->AddUtilityCommand( name, true, makefile->GetHomeOutputDirectory().c_str(), no_byproducts, - no_depends, no_commands, false, comment.c_str()); + no_depends, no_commands, cmp0116_new, false, comment.c_str()); localGen->AddGeneratorTarget( cm::make_unique<cmGeneratorTarget>(target, localGen)); |