diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-05 12:24:41 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-05 12:24:48 (GMT) |
| commit | cf0dc5efbfc63100910967ef80b837387bc836e3 (patch) | |
| tree | ddba3381f61943abb24a7afc798ab7249f8dd296 /Source | |
| parent | f1f5d90752018ff535c5e5346a0690af51d9a7d5 (diff) | |
| parent | 081c4679f7d427aa6d7fd4e9959c7850c169e2c7 (diff) | |
| download | CMake-cf0dc5efbfc63100910967ef80b837387bc836e3.zip CMake-cf0dc5efbfc63100910967ef80b837387bc836e3.tar.gz CMake-cf0dc5efbfc63100910967ef80b837387bc836e3.tar.bz2 | |
Merge topic 'ninja-multi-custom-command-deps' into release-3.17
081c4679f7 Ninja Multi-Config: Don't build target dependencies for custom commands
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4423
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index d3ee8f9..f4d102e 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -1178,7 +1178,8 @@ void cmGlobalNinjaGenerator::AppendTargetDependsClosure( cmNinjaOuts this_outs; // this will be the new cache entry for (auto const& dep_target : this->GetTargetDirectDepends(target)) { - if (dep_target->GetType() == cmStateEnums::INTERFACE_LIBRARY) { + if (dep_target->GetType() == cmStateEnums::INTERFACE_LIBRARY || + (this->EnableCrossConfigBuild() && !dep_target.IsCross())) { continue; } |