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. --- toolsrc/src/vcpkg/build.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'toolsrc/src') diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index a0e138339..70d097873 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -612,6 +612,10 @@ namespace vcpkg::Build { return m_paths.scripts / fs::u8path("toolchains/android.cmake"); } + else if (cmake_system_name == "iOS") + { + return m_paths.scripts / fs::u8path("toolchains/ios.cmake"); + } else if (cmake_system_name.empty() || cmake_system_name == "Windows" || cmake_system_name == "WindowsStore") { return m_paths.scripts / fs::u8path("toolchains/windows.cmake"); -- cgit v1.2.3