diff options
| author | Craig Scott <craig.scott@crascit.com> | 2020-10-23 10:37:47 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-23 10:37:56 (GMT) |
| commit | 5e1858c0c2d819412f2ce0ff8e681f54df42ffe6 (patch) | |
| tree | 4f9f893e97b239b4f469159c8bca9e5b5dbc71d2 /Tests/CMakeGUI/QCMakePresetTest.cxx | |
| parent | 761dc324e043a504f6cec26b03bd86eb59c48710 (diff) | |
| parent | 64afabdbcb265acb53a9b8f8cb86465d31f2ca61 (diff) | |
| download | CMake-5e1858c0c2d819412f2ce0ff8e681f54df42ffe6.zip CMake-5e1858c0c2d819412f2ce0ff8e681f54df42ffe6.tar.gz CMake-5e1858c0c2d819412f2ce0ff8e681f54df42ffe6.tar.bz2 | |
Merge topic 'cmake-presets-toolset-arch-config' into release-3.19
64afabdbcb CMakePresets.json: Split cmakeGeneratorConfig field
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5387
Diffstat (limited to 'Tests/CMakeGUI/QCMakePresetTest.cxx')
| -rw-r--r-- | Tests/CMakeGUI/QCMakePresetTest.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Tests/CMakeGUI/QCMakePresetTest.cxx b/Tests/CMakeGUI/QCMakePresetTest.cxx index 8fd07e7..2081055 100644 --- a/Tests/CMakeGUI/QCMakePresetTest.cxx +++ b/Tests/CMakeGUI/QCMakePresetTest.cxx @@ -16,8 +16,9 @@ QCMakePreset makePreset() /*description=*/"description", /*generator=*/"generator", /*architecture=*/"architecture", + /*setArchitecture=*/true, /*toolset=*/"toolset", - /*setGenConfig=*/true, + /*setToolset=*/true, /*enabled=*/true, }; } @@ -69,12 +70,14 @@ void QCMakePresetTest::equality_data() QTest::newRow("architecture") << makePreset(&QCMakePreset::architecture, "other-architecture") << false << true << false; + QTest::newRow("setArchitecture") + << makePreset(&QCMakePreset::setArchitecture, false) << false << false + << true; QTest::newRow("toolset") << makePreset(&QCMakePreset::toolset, "other-toolset") << false << false << true; - QTest::newRow("setGenConfig") - << makePreset(&QCMakePreset::setGenConfig, false) << false << false - << true; + QTest::newRow("setToolset") + << makePreset(&QCMakePreset::setToolset, false) << false << false << true; QTest::newRow("enabled") << makePreset(&QCMakePreset::enabled, false) << false << false << true; } |