summaryrefslogtreecommitdiffstats
path: root/Source/QtDialog
diff options
context:
space:
mode:
authorRobert Maynard <rmaynard@nvidia.com>2024-01-03 19:51:13 (GMT)
committerRobert Maynard <rmaynard@nvidia.com>2024-01-05 17:04:12 (GMT)
commit9d136743375b6011fcc49f3ab6cfceabd91d216e (patch)
treef8e61e75100e17cae5f662142be93e5568b17c5e /Source/QtDialog
parent9090d340b45fa5092443d1abcf959a9a35a4d0e7 (diff)
downloadCMake-9d136743375b6011fcc49f3ab6cfceabd91d216e.zip
CMake-9d136743375b6011fcc49f3ab6cfceabd91d216e.tar.gz
CMake-9d136743375b6011fcc49f3ab6cfceabd91d216e.tar.bz2
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.
Diffstat (limited to 'Source/QtDialog')
-rw-r--r--Source/QtDialog/CMakeSetupDialog.cxx2
-rw-r--r--Source/QtDialog/FirstConfigure.cxx4
-rw-r--r--Source/QtDialog/FirstConfigure.h1
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,