diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-10-16 20:19:11 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2020-10-22 15:24:39 (GMT) |
| commit | 64afabdbcb265acb53a9b8f8cb86465d31f2ca61 (patch) | |
| tree | ca2616a38a2bf7c80d8635d7fd0f2957645a0a45 /Source/QtDialog/CMakeSetupDialog.cxx | |
| parent | 609122007dc074739b394d2f70f674bbccca6073 (diff) | |
| download | CMake-64afabdbcb265acb53a9b8f8cb86465d31f2ca61.zip CMake-64afabdbcb265acb53a9b8f8cb86465d31f2ca61.tar.gz CMake-64afabdbcb265acb53a9b8f8cb86465d31f2ca61.tar.bz2 | |
CMakePresets.json: Split cmakeGeneratorConfig field
Make this field separate for both architecture and toolset. Allow
architecture and toolset to be either strings or objects with value
and strategy fields.
Fixes: #21317
Diffstat (limited to 'Source/QtDialog/CMakeSetupDialog.cxx')
| -rw-r--r-- | Source/QtDialog/CMakeSetupDialog.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx index 7a04daa..a15614d 100644 --- a/Source/QtDialog/CMakeSetupDialog.cxx +++ b/Source/QtDialog/CMakeSetupDialog.cxx @@ -859,8 +859,10 @@ bool CMakeSetupDialog::setupFirstConfigure() if (presetData.isValid()) { auto preset = presetData.value<QCMakePreset>(); dialog.setCurrentGenerator(preset.generator); - if (preset.setGenConfig) { + if (preset.setArchitecture) { dialog.setPlatform(preset.architecture); + } + if (preset.setToolset) { dialog.setToolset(preset.toolset); } dialog.setCompilerOption(CompilerOption::DefaultNative); |