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/cmakemain.cxx | |
| 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/cmakemain.cxx')
| -rw-r--r-- | Source/cmakemain.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index 5a04eab..10655d5 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -2,7 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmAlgorithms.h" -#include "cmDocumentationEntry.h" +#include "cmDocumentationEntry.h" // IWYU pragma: keep #include "cmGlobalGenerator.h" #include "cmMakefile.h" #include "cmState.h" @@ -227,9 +227,7 @@ int do_cmake(int ac, char const* const* av) std::vector<std::string> args(av, av + ac); hcm.SetCacheArgs(args); - std::vector<cmDocumentationEntry> generators; - - hcm.GetGeneratorDocumentation(generators); + auto generators = hcm.GetGeneratorsDocumentation(); doc.SetName("cmake"); doc.SetSection("Name", cmDocumentationName); |