[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.
This commit is contained in:
alcroito 2020-07-13 23:13:44 +02:00 коммит произвёл GitHub
Родитель 385fb52332
Коммит f1fbee87db
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 6 добавлений и 0 удалений

Просмотреть файл

@ -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()

Просмотреть файл

@ -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");