Skip to content
Snippets Groups Projects
Commit 788d670e authored by Ken Martin's avatar Ken Martin Committed by Kitware Robot
Browse files

Merge topic 'update_ios_sdks'


09aa2916 add support for newer sdks

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Acked-by: default avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !5583
parents e16be129 09aa2916
Branches
Tags
No related merge requests found
......@@ -88,16 +88,15 @@ if (NOT CMAKE_OSX_SYSROOT)
)
foreach(sdk_root ${possible_sdk_roots})
foreach(sdk
iPhoneOS7.0.sdk
iPhoneOS7.1.sdk
iPhoneOS8.0.sdk
iPhoneOS9.0.sdk
iPhoneOS9.1.sdk
iPhoneOS9.2.sdk
iPhoneOS9.3.sdk # guess
iPhoneOS9.4.sdk # guess
iPhoneOS10.0.sdk # guess
iPhoneOS10.1.sdk # guess
iPhoneOS9.3.sdk
iPhoneOS10.0.sdk
iPhoneOS10.1.sdk
iPhoneOS10.2.sdk
iPhoneOS10.3.sdk
iPhoneOS.sdk
)
if (EXISTS ${sdk_root}/${sdk} AND IS_DIRECTORY ${sdk_root}/${sdk})
set(CMAKE_OSX_SYSROOT ${sdk_root}/${sdk})
......
......@@ -74,16 +74,15 @@ if (NOT CMAKE_OSX_SYSROOT)
)
foreach(sdk_root ${possible_sdk_roots})
foreach(sdk
iPhoneSimulator7.0.sdk
iPhoneSimulator7.1.sdk
iPhoneSimulator8.0.sdk
iPhoneSimulator9.0.sdk
iPhoneSimulator9.1.sdk
iPhoneSimulator9.2.sdk
iPhoneSimulator9.3.sdk # guess
iPhoneSimulator9.4.sdk # guess
iPhoneSimulator10.0.sdk # guess
iPhoneSimulator10.1.sdk # guess
iPhoneSimulator9.3.sdk
iPhoneSimulator10.0.sdk
iPhoneSimulator10.1.sdk
iPhoneSimulator10.2.sdk
iPhoneSimulator10.3.sdk
iPhoneSimulator.sdk
)
if (EXISTS ${sdk_root}/${sdk} AND IS_DIRECTORY ${sdk_root}/${sdk})
set(CMAKE_OSX_SYSROOT ${sdk_root}/${sdk})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment