3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 15:07:58 +08:00
Code Issues Projects Releases Wiki Activity

[vcpkg_cmake_configure/vcpkg_configure_cmake] Support VS2022 17.0 (#19088)

Browse Source 
* [vcpkg] Support VS2022 17.0

* small changes

* Update vcpkg.cmake

* Update the baseline version

* Update the baseline version

* Update the baselin version

* Adress the review suggestions

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
Phoebe 2021-09-14 11:10:12 +08:00 committed by GitHub
parent ac0605b700
commit c592209c5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/vcpkg-cmake/vcpkg.json
View File

@ -1,4 +1,4 @@
{
"name": "vcpkg-cmake",
"version-date": "2021-07-30"
"version-date": "2021-09-13"
}

13
ports/vcpkg-cmake/vcpkg_cmake_configure.cmake
View File

@ -207,6 +207,19 @@ function(vcpkg_cmake_configure)
else()
set(generator)
endif()
elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v143")
set(generator "Visual Studio 17 2022")
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
set(arch "Win32")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
set(arch "x64")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
set(arch "ARM")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
set(arch "ARM64")
else()
set(generator)
endif()
endif()
else()
set(generator "Ninja")

2
scripts/buildsystems/vcpkg.cmake
View File

@ -268,6 +268,8 @@ else()
set(Z_VCPKG_TARGET_TRIPLET_ARCH x86)
elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 16 2019$")
set(Z_VCPKG_TARGET_TRIPLET_ARCH x64)
elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 17 2022$")
set(Z_VCPKG_TARGET_TRIPLET_ARCH x64)
else()
find_program(Z_VCPKG_CL cl)
if(Z_VCPKG_CL MATCHES "amd64/cl.exe$" OR Z_VCPKG_CL MATCHES "x64/cl.exe$")

12
scripts/cmake/vcpkg_configure_cmake.cmake
View File

@ -187,6 +187,18 @@ function(vcpkg_configure_cmake)
set(GENERATOR "Visual Studio 16 2019")
set(ARCH "ARM64")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v143")
set(GENERATOR "Visual Studio 17 2022")
set(ARCH "Win32")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v143")
set(GENERATOR "Visual Studio 17 2022")
set(ARCH "x64")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v143")
set(GENERATOR "Visual Studio 17 2022")
set(ARCH "ARM")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v143")
set(GENERATOR "Visual Studio 17 2022")
set(ARCH "ARM64")
else()
if(NOT VCPKG_CMAKE_SYSTEM_NAME)
set(VCPKG_CMAKE_SYSTEM_NAME Windows)

2
versions/baseline.json
View File

@ -6729,7 +6729,7 @@
"port-version": 1
},
"vcpkg-cmake": {
"baseline": "2021-07-30",
"baseline": "2021-09-13",
"port-version": 0
},
"vcpkg-cmake-config": {

5
versions/v-/vcpkg-cmake.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "fc4d9fcc5b8d2b97c083c6b70dd06df5174bd97b",
"version-date": "2021-09-13",
"port-version": 0
},
{
"git-tree": "c6df7e0faeda9e783175746c7c440c9bc2bdb111",
"version-date": "2021-07-30",