From c619be278451f39ed53a91f31060963bfb9a2301 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Mon, 26 Oct 2020 12:00:38 -0400 Subject: ccmake: Don't list --preset in --help And show available options in cmake-gui. Fixes: #21313 --- Source/QtDialog/CMakeSetup.cxx | 7 ++++++- Source/cmake.h | 2 -- 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 ", "Explicitly specify a source directory." }, + { "-B ", "Explicitly specify a build directory." }, + { "--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 ", "Explicitly specify a source directory." }, \ { "-B ", "Explicitly specify a build directory." }, \ - { "--preset=", "Explicitly specify a preset." }, \ - { "--list-presets", "List available presets." }, \ { "-C ", "Pre-load a script to populate the cache." }, \ { "-D [:]=", "Create or update a cmake cache entry." }, \ { "-U ", "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=", "Specify a configure preset." }, + { "--list-presets", "List available presets." }, { "-E", "CMake command mode." }, { "-L[A][H]", "List non-advanced cached variables." }, { "--build ", "Build a CMake-generated project binary tree." }, -- cgit v0.12