Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop 32 bit support on iOS #1374

Closed
wants to merge 2 commits into from
Closed

Drop 32 bit support on iOS #1374

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1304bb
Drop 32 bit support on iOS
JonnyPtn Feb 24, 2018
bf4560a
Remove references to SIMULATOR64, as 32 bit is no longer available
JonnyPtn Feb 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 6 additions & 13 deletions cmake/toolchains/iOS.toolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

# Options:
#
# IOS_PLATFORM = OS (default) or SIMULATOR or SIMULATOR64
# IOS_PLATFORM = OS (default) or SIMULATOR
# This decides if SDKS will be selected from the iPhoneOS.platform or iPhoneSimulator.platform folders
# OS - the default, used to build for iPhone and iPad physical devices, which have an arm arch.
# SIMULATOR - used to build for the Simulator platforms, which have an x86 arch.
# SIMULATOR - used to build for the Simulator platforms, which have an x86_64 arch.
#
# CMAKE_IOS_DEVELOPER_ROOT = automatic(default) or /path/to/platform/Developer folder
# By default this location is automatcially chosen based on the IOS_PLATFORM value above.
Expand Down Expand Up @@ -127,15 +127,9 @@ elseif (${IOS_PLATFORM} STREQUAL SIMULATOR)

# This causes the installers to properly locate the output libraries
set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator")
elseif (${IOS_PLATFORM} STREQUAL SIMULATOR64)
message (STATUS "Targeting iPhoneSimulator64 platform")
set (SIMULATOR true)
set (IOS_PLATFORM_LOCATION "iPhoneSimulator.platform")

# This causes the installers to properly locate the output libraries
set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator")
else (${IOS_PLATFORM} STREQUAL OS)
message (FATAL_ERROR "Unsupported IOS_PLATFORM value '${IOS_PLATFORM}' selected. Please choose OS, SIMULATOR, or SIMULATOR64")
message (FATAL_ERROR "Unsupported IOS_PLATFORM value '${IOS_PLATFORM}' selected. Please choose OS or SIMULATOR")
endif (${IOS_PLATFORM} STREQUAL OS)

# Setup iOS developer location unless specified manually with CMAKE_IOS_DEVELOPER_ROOT
Expand Down Expand Up @@ -173,15 +167,14 @@ message (STATUS "iOS sysroot=${CMAKE_OSX_SYSROOT}")
# set the architecture for iOS
if (${IOS_PLATFORM} STREQUAL OS)
set (OSX_UNIVERSAL true)
set (IOS_ARCH armv7 armv7s arm64)
set (IOS_ARCH arm64)
elseif (${IOS_PLATFORM} STREQUAL SIMULATOR)
set (IOS_ARCH i386)
elseif (${IOS_PLATFORM} STREQUAL SIMULATOR64)
set (IOS_ARCH x86_64)
endif (${IOS_PLATFORM} STREQUAL OS)

set (CMAKE_OSX_ARCHITECTURES ${IOS_ARCH} CACHE string "Build architecture for iOS")
message (STATUS "iOS arches=${IOS_ARCH}")
set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS ${IOS_ARCH})
message (STATUS "iOS architecture=${IOS_ARCH}")

# Set the find root to the iOS developer roots and to user defined paths
set (CMAKE_FIND_ROOT_PATH ${CMAKE_IOS_DEVELOPER_ROOT} ${CMAKE_IOS_SDK_ROOT} ${CMAKE_PREFIX_PATH} CACHE string "iOS find search path root")
Expand Down