diff options
| author | Brad King <brad.king@kitware.com> | 2020-09-18 12:42:21 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-09-18 12:42:28 (GMT) |
| commit | 5d952fd6e2eef8b5943cf437e8a9b5d55cd02782 (patch) | |
| tree | ef68cfb382ad1f93ca1fa118788f421c88da5596 /Source | |
| parent | edb9e3402711c742d6287b8b1b17002c29c95cfe (diff) | |
| parent | 23fe4b861f5cd2c513981b04bee7c36b467ac100 (diff) | |
| download | CMake-5d952fd6e2eef8b5943cf437e8a9b5d55cd02782.zip CMake-5d952fd6e2eef8b5943cf437e8a9b5d55cd02782.tar.gz CMake-5d952fd6e2eef8b5943cf437e8a9b5d55cd02782.tar.bz2 | |
Merge topic 'ninja-multi-automoc-regression'
23fe4b861f Ninja Multi-Config: Fix dependencies of custom commands
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5238
Diffstat (limited to 'Source')
| -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 006925d..6b9a0f3 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -1222,6 +1222,7 @@ void cmGlobalNinjaGenerator::AppendTargetDependsClosure( for (auto const& dep_target : this->GetTargetDirectDepends(target)) { if (!dep_target->IsInBuildSystem() || (target->GetType() != cmStateEnums::UTILITY && + dep_target->GetType() != cmStateEnums::UTILITY && this->EnableCrossConfigBuild() && !dep_target.IsCross())) { continue; } |