summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-03-20 13:47:46 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-03-20 13:47:46 (GMT)
commitc3f416726bee2175804b3004641eac6091df796d (patch)
treed8e407af5067216399a6a4ed6f37e35cf194c991
parentac7d8684c56063469b3ee03cd4f5a60a4a01789e (diff)
parent80afe28a1084d02dc3e010c7a0cabf5258237ddc (diff)
downloadCMake-c3f416726bee2175804b3004641eac6091df796d.zip
CMake-c3f416726bee2175804b3004641eac6091df796d.tar.gz
CMake-c3f416726bee2175804b3004641eac6091df796d.tar.bz2
Merge topic 'ninja-no-circular-phony'
80afe28a Ninja: Do not generate circular phony rules (#15454)
-rw-r--r--Source/cmGlobalNinjaGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 69b1a9d..ac7a6eb 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1069,7 +1069,7 @@ void cmGlobalNinjaGenerator::WriteUnknownExplicitDependencies(std::ostream& os)
this->WritePhonyBuild(os,
"",
deps,
- deps);
+ cmNinjaDeps());
}
}
}