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 /Tests/RunCMake/CMakePresets/RunCMakeTest.cmake | |
| 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 'Tests/RunCMake/CMakePresets/RunCMakeTest.cmake')
| -rw-r--r-- | Tests/RunCMake/CMakePresets/RunCMakeTest.cmake | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake b/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake index dddf05f..bd84510 100644 --- a/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake +++ b/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake @@ -117,8 +117,10 @@ run_cmake_presets(InvalidInheritance) run_cmake_presets(ErrorNoWarningDev) run_cmake_presets(ErrorNoWarningDeprecated) set(CMakePresets_SCHEMA_EXPECTED_RESULT 1) -run_cmake_presets(InvalidCMakeGeneratorConfig) -run_cmake_presets(UnknownCMakeGeneratorConfig) +run_cmake_presets(InvalidArchitectureStrategy) +run_cmake_presets(UnknownArchitectureStrategy) +run_cmake_presets(InvalidToolsetStrategy) +run_cmake_presets(UnknownToolsetStrategy) run_cmake_presets(EmptyCacheKey) run_cmake_presets(EmptyEnvKey) set(CMakePresets_SCHEMA_EXPECTED_RESULT 0) @@ -196,9 +198,9 @@ if(RunCMake_GENERATOR MATCHES "^Visual Studio ") run_cmake_presets(VisualStudioInheritanceMultiSecond) endif() else() - run_cmake_presets(CMakeGeneratorConfigNone) - run_cmake_presets(CMakeGeneratorConfigDefault) - run_cmake_presets(CMakeGeneratorConfigIgnore) + run_cmake_presets(ArchToolsetStrategyNone) + run_cmake_presets(ArchToolsetStrategyDefault) + run_cmake_presets(ArchToolsetStrategyIgnore) endif() # Test bad command line arguments |