From f1fbee87db75a96fbb4a3e64359ba1004209cb40 Mon Sep 17 00:00:00 2001 From: alcroito Date: Mon, 13 Jul 2020 23:13:44 +0200 Subject: [vcpkg] Fix iOS toolchain detection when using the iOS community triplets (#12361) * [vcpkg ios] Fix detection of iOS toolchain (#6003) Added mapping of CMAKE_SYSTEM_NAME == iOS to the bundled iOS toolchain file. This fixes the "Unable to determine toolchain to use for triplet arm64-ios with CMAKE_SYSTEM_NAME iOS" error. * [vcpkg ios] Set the CMake system processor for the simulator arches (#6003) So it's consistent for all architectures. --- scripts/toolchains/ios.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'scripts') diff --git a/scripts/toolchains/ios.cmake b/scripts/toolchains/ios.cmake index 5497117a3..b93cdbb8a 100644 --- a/scripts/toolchains/ios.cmake +++ b/scripts/toolchains/ios.cmake @@ -16,9 +16,11 @@ if(NOT _VCPKG_IOS_TOOLCHAIN) set(_vcpkg_ios_system_processor "arm") set(_vcpkg_ios_target_architecture "armv7") elseif("${arch}" STREQUAL "x64") + set(_vcpkg_ios_system_processor "x86_64") set(_vcpkg_ios_sysroot "iphonesimulator") set(_vcpkg_ios_target_architecture "x86_64") elseif("${arch}" STREQUAL "x86") + set(_vcpkg_ios_system_processor "i386") set(_vcpkg_ios_sysroot "iphonesimulator") set(_vcpkg_ios_target_architecture "i386") else() -- cgit v1.2.3