diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-10-26 16:00:38 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2020-10-27 14:29:24 (GMT) |
| commit | c619be278451f39ed53a91f31060963bfb9a2301 (patch) | |
| tree | 5dc23a3e37ccb7c9ae1e6e0efccec6b2b628dc68 /Source | |
| parent | 8d6a0b9364581fbb95746c93cac4ec3c213f534b (diff) | |
| download | CMake-c619be278451f39ed53a91f31060963bfb9a2301.zip CMake-c619be278451f39ed53a91f31060963bfb9a2301.tar.gz CMake-c619be278451f39ed53a91f31060963bfb9a2301.tar.bz2 | |
ccmake: Don't list --preset in --help
And show available options in cmake-gui.
Fixes: #21313
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/QtDialog/CMakeSetup.cxx | 7 | ||||
| -rw-r--r-- | Source/cmake.h | 2 | ||||
| -rw-r--r-- | Source/cmakemain.cxx | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx index 182c23d..5b9d479 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -36,7 +36,12 @@ static const char* cmDocumentationUsage[][2] = { { nullptr, nullptr } }; -static const char* cmDocumentationOptions[][2] = { { nullptr, nullptr } }; +static const char* cmDocumentationOptions[][2] = { + { "-S <path-to-source>", "Explicitly specify a source directory." }, + { "-B <path-to-build>", "Explicitly specify a build directory." }, + { "--preset=<preset>", "Specify a configure preset." }, + { nullptr, nullptr } +}; #if defined(Q_OS_MAC) static int cmOSXInstall(std::string dir); diff --git a/Source/cmake.h b/Source/cmake.h index 262d673..1ecf2c2 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -704,8 +704,6 @@ private: #define CMAKE_STANDARD_OPTIONS_TABLE \ { "-S <path-to-source>", "Explicitly specify a source directory." }, \ { "-B <path-to-build>", "Explicitly specify a build directory." }, \ - { "--preset=<preset-name>", "Explicitly specify a preset." }, \ - { "--list-presets", "List available presets." }, \ { "-C <initial-cache>", "Pre-load a script to populate the cache." }, \ { "-D <var>[:<type>]=<value>", "Create or update a cmake cache entry." }, \ { "-U <globbing_expr>", "Remove matching entries from CMake cache." }, \ diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index f0963c2..f7734a6 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -64,6 +64,8 @@ const char* cmDocumentationUsageNote[][2] = { const char* cmDocumentationOptions[][2] = { CMAKE_STANDARD_OPTIONS_TABLE, + { "--preset=<preset>", "Specify a configure preset." }, + { "--list-presets", "List available presets." }, { "-E", "CMake command mode." }, { "-L[A][H]", "List non-advanced cached variables." }, { "--build <dir>", "Build a CMake-generated project binary tree." }, |