saberbud/ceres-solver
1
0
Fork 0
mirror of https://github.com/ceres-solver/ceres-solver.git synced 2026-08-29 08:34:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove armv7 from target architectures when building for iOS >= 11.

Browse Source 
- iOS 11+ requires a 64-bit architecture, so only arm64 is supported.

Change-Id: Ieb2ead13ba8722c6c0777b78f59f667331ad670c
This commit is contained in:
Alex Stewart
2018-03-04 12:16:27 +00:00
parent 2f2e7222fa
commit df2d882540
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/iOS.cmake
+23 -9
View File
@@ -120,8 +120,6 @@ elseif(IOS_PLATFORM STREQUAL "SIMULATOR64")
else()
message(FATAL_ERROR "Invalid IOS_PLATFORM: ${IOS_PLATFORM}")
endif()
message(STATUS "Configuring iOS build for platform: ${IOS_PLATFORM}, "
"architecture(s): ${IOS_ARCH}")
# If user did not specify the SDK root to use, then query xcodebuild for it.
if (NOT CMAKE_OSX_SYSROOT)
@@ -190,6 +188,29 @@ execute_process(COMMAND uname -r
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE)
# Specify minimum version of deployment target.
# Unless specified, the latest SDK version is used by default.
set(IOS_DEPLOYMENT_TARGET "${IOS_SDK_VERSION}"
CACHE STRING "Minimum iOS version to build for." )
message(STATUS "Building for minimum iOS version: ${IOS_DEPLOYMENT_TARGET}"
" (SDK version: ${IOS_SDK_VERSION})")
if (NOT IOS_DEPLOYMENT_TARGET VERSION_LESS 11.0)
# iOS 11+ does not support 32-bit architectures (armv7).
foreach(ARCH ${IOS_ARCH})
if (ARCH MATCHES "armv7*")
message(STATUS "Removing iOS architecture: ${ARCH} from build as it is "
"not supported by the minimum iOS version to build for: "
"${IOS_DEPLOYMENT_TARGET} (iOS >= 11 requires 64-bit).")
else()
list(APPEND VALID_IOS_ARCH_FOR_SDK_VERSION ${ARCH})
endif()
endforeach()
set(IOS_ARCH ${VALID_IOS_ARCH_FOR_SDK_VERSION})
endif()
message(STATUS "Configuring iOS build for platform: ${IOS_PLATFORM}, "
"architecture(s): ${IOS_ARCH}")
# Standard settings.
set(CMAKE_SYSTEM_NAME Darwin)
set(CMAKE_SYSTEM_VERSION ${IOS_SDK_VERSION})
@@ -222,13 +243,6 @@ set(CMAKE_C_OSX_CURRENT_VERSION_FLAG "-current_version ")
set(CMAKE_CXX_OSX_COMPATIBILITY_VERSION_FLAG "${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}")
set(CMAKE_CXX_OSX_CURRENT_VERSION_FLAG "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}")
# Specify minimum version of deployment target.
# Unless specified, the latest SDK version is used by default.
set(IOS_DEPLOYMENT_TARGET "${IOS_SDK_VERSION}"
CACHE STRING "Minimum iOS version to build for." )
message(STATUS "Building for minimum iOS version: ${IOS_DEPLOYMENT_TARGET}"
" (SDK version: ${IOS_SDK_VERSION})")
# Note that only Xcode 7+ supports the newer more specific:
# -m${XCODE_IOS_PLATFORM}-version-min flags, older versions of Xcode use:
# -m(ios/ios-simulator)-version-min instead.