summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-04-05 19:31:47 (GMT)
committerBrad King <brad.king@kitware.com>2016-04-05 20:19:52 (GMT)
commitff805113c766371677b97d94cd3092cf6ff0bbf6 (patch)
tree1b35df482cc9086d8d253b13b46a3faa832d3f85 /Source
parent64130a7e793483e24c1d68bdd234f81d5edb2d51 (diff)
downloadCMake-ff805113c766371677b97d94cd3092cf6ff0bbf6.zip
CMake-ff805113c766371677b97d94cd3092cf6ff0bbf6.tar.gz
CMake-ff805113c766371677b97d94cd3092cf6ff0bbf6.tar.bz2
Ninja: Fix detection of custom command symbolic outputs
Fix logic introduced by commit v3.5.0-rc1~198^2 (Ninja: Always re-run custom commands that have symbolic dependencies, 2015-11-19) to not consider only the last output. We need to know if any output is SYMBOLIC, so stop checking as soon as one is found.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmLocalNinjaGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index b2927a9..6a5949c 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))
{