diff options
| author | Brad King <brad.king@kitware.com> | 2016-04-08 13:03:59 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-04-08 13:03:59 (GMT) |
| commit | f6c5958047ee8a9084bf230a6c1acb4801cb2b93 (patch) | |
| tree | 0822d1acd30fa67ad0a33b6c46a6303920d599c5 /Source/cmLocalNinjaGenerator.cxx | |
| parent | 1baf2cbd3dfd76aadcbfd84f6d42d13fcb838218 (diff) | |
| parent | add7abc8352b87184579401cb2493c72e07aa212 (diff) | |
| download | CMake-f6c5958047ee8a9084bf230a6c1acb4801cb2b93.zip CMake-f6c5958047ee8a9084bf230a6c1acb4801cb2b93.tar.gz CMake-f6c5958047ee8a9084bf230a6c1acb4801cb2b93.tar.bz2 | |
Merge topic 'ninja-restat-custom-command-byproducts'
add7abc8 Ninja: Restat custom command byproducts even with a SYMBOLIC output (#16049)
ff805113 Ninja: Fix detection of custom command symbolic outputs
Diffstat (limited to 'Source/cmLocalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmLocalNinjaGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 8a68af6..030b094 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -400,7 +400,7 @@ cmLocalNinjaGenerator::WriteCustomCommandBuildStatement( bool symbolic = false; for (std::vector<std::string>::const_iterator o = outputs.begin(); - o != outputs.end(); ++o) + !symbolic && o != outputs.end(); ++o) { if (cmSourceFile* sf = this->Makefile->GetSource(*o)) { @@ -444,7 +444,7 @@ cmLocalNinjaGenerator::WriteCustomCommandBuildStatement( this->ConstructComment(ccg), "Custom command for " + ninjaOutputs[0], cc->GetUsesTerminal(), - /*restat*/!symbolic, + /*restat*/!symbolic || !byproducts.empty(), ninjaOutputs, ninjaDeps, orderOnlyDeps); |