-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge topic 'vs-sdk-selection' into release-3.27
89b611a VS: Select latest Windows SDK even when targeting Windows 8.1 and below ae97d82 VS: Teach CMAKE_GENERATOR_PLATFORM to support Windows 8.1 SDK selection 15ff896 VS: Teach CMAKE_GENERATOR_PLATFORM to use Windows 10 SDKs for older versions bba1a23 VS: Consolidate Windows SDK major version selection dispatch 209973e VS: Do not print empty Windows SDK version when none is selected ec6dd77 Tests: Remove redundant condition in RunCMake.GeneratorPlatform test 4776a58 Help: Add 3.27 release note on VS default SDK selection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8697
- Loading branch information
Showing
18 changed files
with
201 additions
and
109 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 0 additions & 19 deletions
19
Tests/RunCMake/GeneratorPlatform/BadVersionPlatform-stderr.txt
This file was deleted.
Oops, something went wrong.
File renamed without changes.
11 changes: 11 additions & 0 deletions
11
Tests/RunCMake/GeneratorPlatform/BadVersionPre2019-stderr.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
^CMake Error at CMakeLists.txt:[0-9]+ \(project\): | ||
Generator | ||
|
||
Visual Studio [^ | ||
]+ | ||
|
||
given platform specification containing a | ||
|
||
version=10\.0 | ||
|
||
field\. The value 10\.0 is only supported by VS 2019 and above\.$ |
File renamed without changes.
1 change: 1 addition & 0 deletions
1
Tests/RunCMake/GeneratorPlatform/BadVersionUnsupported-result.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
1 |
11 changes: 11 additions & 0 deletions
11
Tests/RunCMake/GeneratorPlatform/BadVersionUnsupported-stderr.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
^CMake Error at CMakeLists.txt:[0-9]+ \(project\): | ||
Generator | ||
|
||
Visual Studio [^ | ||
]+ | ||
|
||
given platform specification containing a | ||
|
||
version=1\.2\.3\.4 | ||
|
||
field with unsupported value\.$ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
message(FATAL_ERROR "This should not be reached!") |
Oops, something went wrong.