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/cmake.h | |
| 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/cmake.h')
| -rw-r--r-- | Source/cmake.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmake.h b/Source/cmake.h index 38d0c62..9478ad0e 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -295,7 +295,7 @@ public: cmVariableWatch* GetVariableWatch() { return this->VariableWatch; } #endif - void GetGeneratorDocumentation(std::vector<cmDocumentationEntry>&); + std::vector<cmDocumentationEntry> GetGeneratorsDocumentation(); ///! Set/Get a property of this target file void SetProperty(const std::string& prop, const char* value); @@ -534,8 +534,12 @@ private: // Print a list of valid generators to stderr. void PrintGeneratorList(); + std::unique_ptr<cmGlobalGenerator> EvaluateDefaultGlobalGenerator(); void CreateDefaultGlobalGenerator(); + void AppendGlobalGeneratorsDocumentation(std::vector<cmDocumentationEntry>&); + void AppendExtraGeneratorsDocumentation(std::vector<cmDocumentationEntry>&); + /** * Convert a message type between a warning and an error, based on the state * of the error output CMake variables, in the cache. |