diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-09-17 17:49:52 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2020-09-17 19:46:57 (GMT) |
| commit | 23fe4b861f5cd2c513981b04bee7c36b467ac100 (patch) | |
| tree | 6cfffca130f12e87ea14d2c4539d65585512790c /Source/cmGlobalNinjaGenerator.cxx | |
| parent | 314039ba45ad4f7779e2c4df46dab3fac3703194 (diff) | |
| download | CMake-23fe4b861f5cd2c513981b04bee7c36b467ac100.zip CMake-23fe4b861f5cd2c513981b04bee7c36b467ac100.tar.gz CMake-23fe4b861f5cd2c513981b04bee7c36b467ac100.tar.bz2 | |
Ninja Multi-Config: Fix dependencies of custom commands
a9fd3a10 addressed the scenario where the depending target is a
utility target, but not the scenario where the dependent target is
a utility target. Account for this scenario.
Also add a Qt-specific test case.
Fixes: #21118
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index f11cd50..04155e0 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -1171,6 +1171,7 @@ void cmGlobalNinjaGenerator::AppendTargetDependsClosure( for (auto const& dep_target : this->GetTargetDirectDepends(target)) { if (dep_target->GetType() == cmStateEnums::INTERFACE_LIBRARY || (target->GetType() != cmStateEnums::UTILITY && + dep_target->GetType() != cmStateEnums::UTILITY && this->EnableCrossConfigBuild() && !dep_target.IsCross())) { continue; } |