summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalNinjaGenerator.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-09-21 18:22:41 (GMT)
committerBrad King <brad.king@kitware.com>2016-09-22 17:52:02 (GMT)
commit0488ae63ea8dfa8ac455e36b7cc41e81620a080f (patch)
tree6dc998210b932a923ebc31a312abca0ea4d0b77e /Source/cmGlobalNinjaGenerator.h
parentf0a23aa3dbbe2751bbb4969e1371380561b566ee (diff)
downloadCMake-0488ae63ea8dfa8ac455e36b7cc41e81620a080f.zip
CMake-0488ae63ea8dfa8ac455e36b7cc41e81620a080f.tar.gz
CMake-0488ae63ea8dfa8ac455e36b7cc41e81620a080f.tar.bz2
Ninja: Refactor ninja feature detection
Check for features as soon as we know the ninja version. Save the results so we do not have to re-compare versions every time.
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.h')
-rw-r--r--Source/cmGlobalNinjaGenerator.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index ac7a6b1..5c7d8fa 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -355,6 +355,7 @@ protected:
private:
std::string GetEditCacheCommand() const CM_OVERRIDE;
void FindMakeProgram(cmMakefile* mf) CM_OVERRIDE;
+ void CheckNinjaFeatures();
bool CheckLanguages(std::vector<std::string> const& languages,
cmMakefile* mf) const CM_OVERRIDE;
@@ -441,6 +442,8 @@ private:
std::string NinjaCommand;
std::string NinjaVersion;
+ bool NinjaSupportsConsolePool;
+ bool NinjaSupportsImplicitOuts;
private:
void InitOutputPathPrefix();