diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-28 11:47:32 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-28 11:47:38 (GMT) |
| commit | 5ca2910f5fdbfcddcb0275d0a99c322d2e5cc2be (patch) | |
| tree | 2dfaf309cb07d1ae36c2f61e61d45be7ee28a8d1 | |
| parent | 2ccb7081031212314cd689b533f8372871098008 (diff) | |
| parent | c619be278451f39ed53a91f31060963bfb9a2301 (diff) | |
| download | CMake-5ca2910f5fdbfcddcb0275d0a99c322d2e5cc2be.zip CMake-5ca2910f5fdbfcddcb0275d0a99c322d2e5cc2be.tar.gz CMake-5ca2910f5fdbfcddcb0275d0a99c322d2e5cc2be.tar.bz2 | |
Merge topic 'cmake-presets-help-flag'
c619be2784 ccmake: Don't list --preset in --help
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5428
| -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 7c3675b..c1555a2 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -37,7 +37,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 f70fd14..914b827 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." }, |