diff options
| author | Sylvain Joubert <joubert.sy@gmail.com> | 2014-10-02 19:21:05 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-10-03 12:48:47 (GMT) |
| commit | 9f32a2411b35df1d80a65a3e27e9db6faf959c91 (patch) | |
| tree | 590110a64a55551693e031871f02f89d22dc0ceb /Source/cmGlobalNinjaGenerator.h | |
| parent | 99d34f46fa394a9daabb7ca959e1540ae3a41ef2 (diff) | |
| download | CMake-9f32a2411b35df1d80a65a3e27e9db6faf959c91.zip CMake-9f32a2411b35df1d80a65a3e27e9db6faf959c91.tar.gz CMake-9f32a2411b35df1d80a65a3e27e9db6faf959c91.tar.bz2 | |
Ninja: Use 'console' pool for CMake re-run if possible (#14915)
The pre-defined 'console' pool is a non-buffered pool that runs with a
depth of 1. CMake re-run cannot be run concurrently and it will
eventually output something. A non-buffered pool allows to get it as
soon as possible
Also, generate the minimal required version of Ninja in the build file.
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.h')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h index 4cbbeea..a192eee 100644 --- a/Source/cmGlobalNinjaGenerator.h +++ b/Source/cmGlobalNinjaGenerator.h @@ -297,6 +297,8 @@ public: void AddTargetAlias(const std::string& alias, cmTarget* target); virtual void ComputeTargetObjectDirectory(cmGeneratorTarget* gt) const; + + std::string ninjaVersion() const; protected: /// Overloaded methods. @see cmGlobalGenerator::Generate() @@ -335,7 +337,6 @@ private: std::string ninjaCmd() const; - /// The file containing the build statement. (the relation ship of the /// compilation DAG). cmGeneratedFileStream* BuildFileStream; |