From 9d136743375b6011fcc49f3ab6cfceabd91d216e Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Wed, 3 Jan 2024 14:51:13 -0500 Subject: cmake-gui: Hint that the preset compilers will be used Instead of stating that the default is the native compilers, say we will use the compilers from the preset. This makes it more clear that the preset is working as expected. --- Source/QtDialog/CMakeSetupDialog.cxx | 2 +- Source/QtDialog/FirstConfigure.cxx | 4 ++++ Source/QtDialog/FirstConfigure.h | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) 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, -- cgit v0.12