diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-27 10:59:50 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-27 06:59:57 -0400 |
| commit | 2a1da463e9c57f3091c3868aed5d1187bbc29ba8 (patch) | |
| tree | ea320cfc2f5a883e0785ab3a1de9616602faea11 /Source/cmGlobalNinjaGenerator.cxx | |
| parent | 9cadb345d9513b386295a75c96bcbece543798b2 (diff) | |
| parent | b8937a992b956b16a9181737f695ca118c5eea49 (diff) | |
| download | cmake-2a1da463e9c57f3091c3868aed5d1187bbc29ba8.tar.gz | |
Merge topic 'ninja-multi-per-config-sources'
b8937a992b Merge branch 'release' into ninja-multi-per-config-sources
d13bd6ec3d Ninja Multi-Config: Don't try to calculate dependencies for "all"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !5430
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 9b27bc53ae..12b5033069 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -1253,7 +1253,9 @@ void cmGlobalNinjaGenerator::AddTargetAlias(const std::string& alias, std::string outputPath = this->NinjaOutputPath(alias); std::string buildAlias = this->BuildAlias(outputPath, config); cmNinjaDeps outputs; - this->AppendTargetOutputs(target, outputs, config, DependOnTargetArtifact); + if (config != "all") { + this->AppendTargetOutputs(target, outputs, config, DependOnTargetArtifact); + } // Mark the target's outputs as ambiguous to ensure that no other target // uses the output as an alias. for (std::string const& output : outputs) { |