diff options
| author | Brad King <brad.king@kitware.com> | 2024-01-08 14:33:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-01-08 14:34:07 (GMT) |
| commit | 4a4d639334cdada987fa08f1e5179ab3726ad9c7 (patch) | |
| tree | 26f99c8a1d5adfdc44e73eb0ed6224d38ff0c08d /Source | |
| parent | 16f88908a6cf02c60645e6ee2e543a691f9172e7 (diff) | |
| parent | 9d136743375b6011fcc49f3ab6cfceabd91d216e (diff) | |
| download | CMake-4a4d639334cdada987fa08f1e5179ab3726ad9c7.zip CMake-4a4d639334cdada987fa08f1e5179ab3726ad9c7.tar.gz CMake-4a4d639334cdada987fa08f1e5179ab3726ad9c7.tar.bz2 | |
Merge topic 'cmake-gui_better_text_with_preset'
9d13674337 cmake-gui: Hint that the preset compilers will be used
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !9125
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/QtDialog/CMakeSetupDialog.cxx | 2 | ||||
| -rw-r--r-- | Source/QtDialog/FirstConfigure.cxx | 4 | ||||
| -rw-r--r-- | Source/QtDialog/FirstConfigure.h | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx index ab77818..2a6a831 100644 --- a/Source/QtDialog/CMakeSetupDialog.cxx +++ b/Source/QtDialog/CMakeSetupDialog.cxx @@ -875,7 +875,7 @@ bool CMakeSetupDialog::setupFirstConfigure() if (preset.setToolset) { dialog.setToolset(preset.toolset); } - dialog.setCompilerOption(CompilerOption::DefaultNative); + dialog.setCompilerOption(CompilerOption::DefaultPreset); } if (dialog.exec() == QDialog::Accepted) { diff --git a/Source/QtDialog/FirstConfigure.cxx b/Source/QtDialog/FirstConfigure.cxx index a454cb6..2986e1f 100644 --- a/Source/QtDialog/FirstConfigure.cxx +++ b/Source/QtDialog/FirstConfigure.cxx @@ -159,6 +159,10 @@ void StartCompilerSetup::setCompilerOption(CompilerOption option) { std::size_t index = 0; switch (option) { + case CompilerOption::DefaultPreset: + this->CompilerSetupOptions[0]->setText( + tr("Use default preset compilers")); + CM_FALLTHROUGH; case CompilerOption::DefaultNative: index = 0; break; diff --git a/Source/QtDialog/FirstConfigure.h b/Source/QtDialog/FirstConfigure.h index 5844f3a..ea6fae6 100644 --- a/Source/QtDialog/FirstConfigure.h +++ b/Source/QtDialog/FirstConfigure.h @@ -24,6 +24,7 @@ enum FirstConfigurePages enum class CompilerOption { + DefaultPreset, DefaultNative, SpecifyNative, ToolchainFile, |