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/cmLocalNinjaGenerator.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/cmLocalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmLocalNinjaGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index b8ad1a0..8ed411a 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -658,7 +658,7 @@ void cmLocalNinjaGenerator::WriteCustomCommandBuildStatement( std::string depfile = cc->GetDepfile(); if (!depfile.empty()) { - switch (this->GetPolicyStatus(cmPolicies::CMP0116)) { + switch (cc->GetCMP0116Status()) { case cmPolicies::WARN: if (this->GetCurrentBinaryDirectory() != this->GetBinaryDirectory() || @@ -772,7 +772,7 @@ cmLocalNinjaGenerator::MakeCustomCommandGenerators( cmGlobalNinjaGenerator const* gg = this->GetGlobalNinjaGenerator(); bool transformDepfile = false; - switch (this->GetPolicyStatus(cmPolicies::CMP0116)) { + switch (cc.GetCMP0116Status()) { case cmPolicies::OLD: case cmPolicies::WARN: break; |