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/QCMakePresetItemModelTest.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/QCMakePresetItemModelTest.cxx')
-rw-r--r-- | Tests/CMakeGUI/QCMakePresetItemModelTest.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Tests/CMakeGUI/QCMakePresetItemModelTest.cxx b/Tests/CMakeGUI/QCMakePresetItemModelTest.cxx index ee45d39..97dbb30 100644 --- a/Tests/CMakeGUI/QCMakePresetItemModelTest.cxx +++ b/Tests/CMakeGUI/QCMakePresetItemModelTest.cxx @@ -32,8 +32,9 @@ void QCMakePresetItemModelTest::initTestCase_data() /*description=*/"", /*generator=*/"", /*architecture=*/"", + /*setArchitecture=*/true, /*toolset=*/"", - /*setGenConfig=*/true, + /*setToolset=*/true, /*enabled=*/true, }, QCMakePreset{ @@ -42,8 +43,9 @@ void QCMakePresetItemModelTest::initTestCase_data() /*description=*/"", /*generator=*/"", /*architecture=*/"", + /*setArchitecture=*/true, /*toolset=*/"", - /*setGenConfig=*/true, + /*setToolset=*/true, /*enabled=*/true, }, QCMakePreset{ @@ -52,8 +54,9 @@ void QCMakePresetItemModelTest::initTestCase_data() /*description=*/"Long Description", /*generator=*/"", /*architecture=*/"", + /*setArchitecture=*/true, /*toolset=*/"", - /*setGenConfig=*/true, + /*setToolset=*/true, /*enabled=*/true, }, QCMakePreset{ @@ -62,8 +65,9 @@ void QCMakePresetItemModelTest::initTestCase_data() /*description=*/"", /*generator=*/"", /*architecture=*/"", + /*setArchitecture=*/true, /*toolset=*/"", - /*setGenConfig=*/true, + /*setToolset=*/true, /*enabled=*/false, }, }; |