diff options
| author | Brad King <brad.king@kitware.com> | 2023-08-08 20:03:40 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-08-10 13:34:50 (GMT) |
| commit | 15ff89654b925b74f074ef7e13ed905c3ec38c4b (patch) | |
| tree | 948aea4dc32ba8c5294590c39e0ad81a498b2f99 /Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake | |
| parent | bba1a23da9d64c4ef8d68d22af7b5c93727b66a7 (diff) | |
| download | CMake-15ff89654b925b74f074ef7e13ed905c3ec38c4b.zip CMake-15ff89654b925b74f074ef7e13ed905c3ec38c4b.tar.gz CMake-15ff89654b925b74f074ef7e13ed905c3ec38c4b.tar.bz2 | |
VS: Teach CMAKE_GENERATOR_PLATFORM to use Windows 10 SDKs for older versions
Honor an explicit `version=` field selecting a Windows 10 SDK regardless
of the Windows target version.
Issue: #25170
Diffstat (limited to 'Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake')
| -rw-r--r-- | Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake b/Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake index 9718ca9..5c1689a 100644 --- a/Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake +++ b/Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake @@ -36,12 +36,16 @@ if("${RunCMake_GENERATOR}" MATCHES "^Visual Studio (1[4567])( 20[0-9][0-9])?$") run_cmake(BadFieldUnknown) set(RunCMake_GENERATOR_PLATFORM "version=") run_cmake(BadVersionEmpty) - set(RunCMake_GENERATOR_PLATFORM "version=1.2.3.4") + set(RunCMake_GENERATOR_PLATFORM "version=10.0.0.0") run_cmake(BadVersionMissing) - set(RunCMake_GENERATOR_PLATFORM "version=8.1") - run_cmake_with_options(BadVersionPlatform -DCMAKE_SYSTEM_VERSION=8.1) + set(RunCMake_GENERATOR_PLATFORM "version=1.2.3.4") + run_cmake(BadVersionUnsupported) - if(NOT RunCMake_GENERATOR MATCHES "^Visual Studio (1[45]) ") + if(RunCMake_GENERATOR MATCHES "^Visual Studio (1[45]) ") + set(RunCMake_GENERATOR_PLATFORM "version=10.0") + run_cmake(BadVersionPre2019) + unset(RunCMake_GENERATOR_PLATFORM) + else() set(expect_version "10.0") set(RunCMake_GENERATOR_PLATFORM "version=${expect_version}") set(RunCMake_TEST_VARIANT_DESCRIPTION "-${expect_version}") |