diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-15 15:46:12 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-04-15 15:46:12 (GMT) |
| commit | fc579b91e0c2f433c17ce004faa38863c15e8ead (patch) | |
| tree | fca05d87ea72cdba2b2f88e7c07e951372c1ec4c | |
| parent | 9212d0a75d5f0dd01deb5acbe83fd376862f0948 (diff) | |
| parent | 9ac05683902c7412476c4514588bff5c016d6ce1 (diff) | |
| download | CMake-fc579b91e0c2f433c17ce004faa38863c15e8ead.zip CMake-fc579b91e0c2f433c17ce004faa38863c15e8ead.tar.gz CMake-fc579b91e0c2f433c17ce004faa38863c15e8ead.tar.bz2 | |
Merge topic 'doc-ninja-non-experimental'
9ac05683 Ninja: Drop 'experimental' label in documentation
| -rw-r--r-- | Help/generator/Ninja.rst | 2 | ||||
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Help/generator/Ninja.rst b/Help/generator/Ninja.rst index 08f74fb..920abcb 100644 --- a/Help/generator/Ninja.rst +++ b/Help/generator/Ninja.rst @@ -1,7 +1,7 @@ Ninja ----- -Generates build.ninja files (experimental). +Generates build.ninja files. A build.ninja file is generated into the build tree. Recent versions of the ninja program can build the project through the "all" target. diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index f74f1e0..9a00fa6 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -507,7 +507,7 @@ void cmGlobalNinjaGenerator ::GetDocumentation(cmDocumentationEntry& entry) { entry.Name = cmGlobalNinjaGenerator::GetActualName(); - entry.Brief = "Generates build.ninja files (experimental)."; + entry.Brief = "Generates build.ninja files."; } // Implemented in all cmGlobaleGenerator sub-classes. |