diff options
| author | David Cole <david.cole@kitware.com> | 2012-04-25 18:00:59 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-04-25 18:00:59 (GMT) |
| commit | 04f5dd8ad49086f22cf866713482b5ea8c19f9fb (patch) | |
| tree | 30366a271969e8000840f8fc88adf38d36d2e5f4 /Source/cmExtraCodeBlocksGenerator.cxx | |
| parent | 14be8dd264e2b8bc5a0c7c883bae4338d3c960e7 (diff) | |
| parent | c9747f34ce3f9b00adb2d3048b845e8efe270f97 (diff) | |
| download | CMake-04f5dd8ad49086f22cf866713482b5ea8c19f9fb.zip CMake-04f5dd8ad49086f22cf866713482b5ea8c19f9fb.tar.gz CMake-04f5dd8ad49086f22cf866713482b5ea8c19f9fb.tar.bz2 | |
Merge topic 'ninja-patches'
c9747f3 Ninja: CMAKE_USE_NINJA is the name of the macro
2a081a2 Ninja: no additional variable needed to enable ninja
b8c3e8c Ninja: enable Ninja for CodeBlocks
11bd9b5 Ninja: remove GCC -Wshadow warning
f93e818 Ninja: add option to enable ninja where it is not enabled by default
73426ac Ninja: no 16:9 screens for the cmake team ;)
8217c26 Ninja: ensure output directories exist
Diffstat (limited to 'Source/cmExtraCodeBlocksGenerator.cxx')
| -rw-r--r-- | Source/cmExtraCodeBlocksGenerator.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index ccb17f0..084c904 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -60,6 +60,9 @@ cmExtraCodeBlocksGenerator::cmExtraCodeBlocksGenerator() // disable until somebody actually tests it: // this->SupportedGlobalGenerators.push_back("MSYS Makefiles"); #endif +#ifdef CMAKE_USE_NINJA + this->SupportedGlobalGenerators.push_back("Ninja"); +#endif this->SupportedGlobalGenerators.push_back("Unix Makefiles"); } |