Browse Source

fix(ios): fix cmake ios cross build

GitOrigin-RevId: 64e74594ce
release-1.1
Megvii Engine Team 4 years ago
parent
commit
b13c78a532
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      CMakeLists.txt
  2. +2
    -2
      toolchains/ios.toolchain.cmake

+ 1
- 1
CMakeLists.txt View File

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


+ 2
- 2
toolchains/ios.toolchain.cmake View File

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


Loading…
Cancel
Save