mirror of https://github.com/microsoft/vcpkg.git
Fixed watchos arm32 target (needs armv7k) (#49385)
This commit is contained in:
parent
fafcc0e93b
commit
68a6622119
|
|
@ -38,6 +38,9 @@ if(NOT _VCPKG_IOS_TOOLCHAIN)
|
||||||
elseif("${arch}" STREQUAL "arm")
|
elseif("${arch}" STREQUAL "arm")
|
||||||
set(_vcpkg_ios_system_processor "arm")
|
set(_vcpkg_ios_system_processor "arm")
|
||||||
set(_vcpkg_ios_target_architecture "armv7")
|
set(_vcpkg_ios_target_architecture "armv7")
|
||||||
|
elseif("${arch}" STREQUAL "armv7k")
|
||||||
|
set(_vcpkg_ios_system_processor "arm")
|
||||||
|
set(_vcpkg_ios_target_architecture "armv7k")
|
||||||
elseif("${arch}" STREQUAL "x64")
|
elseif("${arch}" STREQUAL "x64")
|
||||||
set(_vcpkg_ios_system_processor "x86_64")
|
set(_vcpkg_ios_system_processor "x86_64")
|
||||||
set(_vcpkg_ios_sysroot "iphonesimulator")
|
set(_vcpkg_ios_sysroot "iphonesimulator")
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
set(VCPKG_TARGET_ARCHITECTURE arm)
|
set(VCPKG_TARGET_ARCHITECTURE armv7k)
|
||||||
set(VCPKG_CRT_LINKAGE dynamic)
|
set(VCPKG_CRT_LINKAGE dynamic)
|
||||||
set(VCPKG_LIBRARY_LINKAGE static)
|
set(VCPKG_LIBRARY_LINKAGE static)
|
||||||
set(VCPKG_CMAKE_SYSTEM_NAME watchOS)
|
set(VCPKG_CMAKE_SYSTEM_NAME watchOS)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue