diff options
| author | Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> | 2018-08-09 03:40:00 (GMT) |
|---|---|---|
| committer | Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> | 2018-08-09 17:32:23 (GMT) |
| commit | 180c2f8de8b1cc19e7dafeaf571d8fa2b203d78f (patch) | |
| tree | ce0ecef81d78479d4ec17b04d6731ebc3390880d /Source/cmGlobalNinjaGenerator.cxx | |
| parent | 708dcbfdf587a2a84c4fdfc64f80d358e6efffb0 (diff) | |
| download | CMake-180c2f8de8b1cc19e7dafeaf571d8fa2b203d78f.zip CMake-180c2f8de8b1cc19e7dafeaf571d8fa2b203d78f.tar.gz CMake-180c2f8de8b1cc19e7dafeaf571d8fa2b203d78f.tar.bz2 | |
Ninja: Fix dupbuild error skipping alias with conflicting custom command
See-also: https://issues.slicer.org/view.php?id=4595
Reported-by: Isaiah Norton <inorton@bwh.harvard.edu>
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 6f7e82a..531f79e 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -1112,6 +1112,12 @@ void cmGlobalNinjaGenerator::WriteTargetAliases(std::ostream& os) continue; } + // Don't write alias if there is a already a custom command with + // matching output + if (this->HasCustomCommandOutput(ta.first)) { + continue; + } + cmNinjaDeps deps; this->AppendTargetOutputs(ta.second, deps); |