From b13c78a53248f7ded5a7226d2d798a1ba1246837 Mon Sep 17 00:00:00 2001 From: Megvii Engine Team Date: Fri, 23 Oct 2020 10:16:42 +0800 Subject: [PATCH] fix(ios): fix cmake ios cross build GitOrigin-RevId: 64e74594cec19a1ab41c769e1b76585b70de1e6d --- CMakeLists.txt | 2 +- toolchains/ios.toolchain.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fe36c64..aac73da0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,7 +144,7 @@ if(${MGE_ARCH} STREQUAL "AUTO") endif() endif() -if(${MGE_ARCH} STREQUAL "x86_64" OR ${MGE_ARCH} STREQUAL "i386" OR ${MGE_ARCH} STREQUAL "armv7" OR ${MGE_ARCH} STREQUAL "aarch64") +if((${MGE_ARCH} STREQUAL "x86_64" OR ${MGE_ARCH} STREQUAL "i386" OR ${MGE_ARCH} STREQUAL "armv7" OR ${MGE_ARCH} STREQUAL "aarch64") AND NOT APPLE) option(MGE_ENABLE_CPUINFO "Build cpuinfo library for check runtime." ON) if(MGE_ENABLE_CPUINFO) message("-- Enable cpuinfo runtime check and little kernel optimize.") diff --git a/toolchains/ios.toolchain.cmake b/toolchains/ios.toolchain.cmake index 6109cf55..26eabf51 100644 --- a/toolchains/ios.toolchain.cmake +++ b/toolchains/ios.toolchain.cmake @@ -226,8 +226,8 @@ if (NOT DEFINED IOS_DEPLOYMENT_TARGET) set(IOS_DEPLOYMENT_TARGET "2.0" CACHE STRING "Minimum iOS version to build for." ) else() - # Unless specified, SDK version 8.0 is used by default as minimum target version (iOS, tvOS). - set(IOS_DEPLOYMENT_TARGET "8.0" + # Unless specified, SDK version 10.0 is used by default as minimum target version (iOS, tvOS). + set(IOS_DEPLOYMENT_TARGET "10.0" CACHE STRING "Minimum iOS version to build for." ) endif() message(STATUS "Using the default min-version since IOS_DEPLOYMENT_TARGET not provided!")