diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-22 16:36:51 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-22 16:37:01 (GMT) |
| commit | a1f65014a30c7e9da15c87e3cca1d86b480c5339 (patch) | |
| tree | 6f82c3cd8b0ff823fb8590f7e352b09ea1a659c1 /Source/CursesDialog | |
| parent | bcc9ea2b3d9cd3b882dbb2a23502b0392cb21d1b (diff) | |
| parent | dfd5ae7da71ed9330eca7e352b8f9b42babdf3dd (diff) | |
| download | CMake-a1f65014a30c7e9da15c87e3cca1d86b480c5339.zip CMake-a1f65014a30c7e9da15c87e3cca1d86b480c5339.tar.gz CMake-a1f65014a30c7e9da15c87e3cca1d86b480c5339.tar.bz2 | |
Merge topic 'help-mark-default-generator'
dfd5ae7da7 Help: Mark default CMake generator with asterisk
6023fe7ff2 ccmake: Append rather than replace Generators section of docs
7408cd3929 cmake: Return generator docs directly
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2682
Diffstat (limited to 'Source/CursesDialog')
| -rw-r--r-- | Source/CursesDialog/ccmake.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx index 856723a..dbf4a28 100644 --- a/Source/CursesDialog/ccmake.cxx +++ b/Source/CursesDialog/ccmake.cxx @@ -5,7 +5,7 @@ #include "cmCursesMainForm.h" #include "cmCursesStandardIncludes.h" #include "cmDocumentation.h" -#include "cmDocumentationEntry.h" +#include "cmDocumentationEntry.h" // IWYU pragma: keep #include "cmState.h" #include "cmSystemTools.h" #include "cmake.h" @@ -88,15 +88,14 @@ int main(int argc, char const* const* argv) hcm.SetHomeDirectory(""); hcm.SetHomeOutputDirectory(""); hcm.AddCMakePaths(); - std::vector<cmDocumentationEntry> generators; - hcm.GetGeneratorDocumentation(generators); + auto generators = hcm.GetGeneratorsDocumentation(); doc.SetName("ccmake"); doc.SetSection("Name", cmDocumentationName); doc.SetSection("Usage", cmDocumentationUsage); if (argc == 1) { doc.AppendSection("Usage", cmDocumentationUsageNote); } - doc.SetSection("Generators", generators); + doc.AppendSection("Generators", generators); doc.PrependSection("Options", cmDocumentationOptions); return doc.PrintRequestedDocumentation(std::cout) ? 0 : 1; } |