From b6d5565df10eb93d9e1e500f954ea1434777f57e Mon Sep 17 00:00:00 2001 From: Andrew Mroczkowski Date: Tue, 18 Sep 2018 15:42:03 -0400 Subject: [PATCH] build: fix Xcode 10 build problems Updating the base SDK from 6.0 to 8.0 where applicable --- platforms/ios/build_framework.py | 2 +- platforms/ios/cmake/Toolchains/common-ios-toolchain.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platforms/ios/build_framework.py b/platforms/ios/build_framework.py index 32305f9a08..ea3a654c73 100644 --- a/platforms/ios/build_framework.py +++ b/platforms/ios/build_framework.py @@ -161,7 +161,7 @@ class Builder: else: arch = ";".join(archs) buildcmd += [ - "IPHONEOS_DEPLOYMENT_TARGET=6.0", + "IPHONEOS_DEPLOYMENT_TARGET=8.0", "ARCHS=%s" % arch, ] diff --git a/platforms/ios/cmake/Toolchains/common-ios-toolchain.cmake b/platforms/ios/cmake/Toolchains/common-ios-toolchain.cmake index 3eeb29199a..86087abf44 100644 --- a/platforms/ios/cmake/Toolchains/common-ios-toolchain.cmake +++ b/platforms/ios/cmake/Toolchains/common-ios-toolchain.cmake @@ -110,7 +110,7 @@ ${CMAKE_MAKE_PROGRAM} IPHONEOS_DEPLOYMENT_TARGET=8.0 -sdk ${CMAKE_OSX_SYSROOT} \ else() set(_xcodebuild_wrapper_tmp "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/xcodebuild_wrapper") file(WRITE "${_xcodebuild_wrapper_tmp}" "#!/bin/sh -${CMAKE_MAKE_PROGRAM} IPHONEOS_DEPLOYMENT_TARGET=6.0 ARCHS=${IOS_ARCH} -sdk ${CMAKE_OSX_SYSROOT} \$*") +${CMAKE_MAKE_PROGRAM} IPHONEOS_DEPLOYMENT_TARGET=8.0 ARCHS=${IOS_ARCH} -sdk ${CMAKE_OSX_SYSROOT} \$*") # Make executable file(COPY "${_xcodebuild_wrapper_tmp}" DESTINATION ${CMAKE_BINARY_DIR} FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) set(CMAKE_MAKE_PROGRAM "${_xcodebuild_wrapper}" CACHE INTERNAL "" FORCE) @@ -162,4 +162,4 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -toolchain_save_config(IOS_ARCH) \ No newline at end of file +toolchain_save_config(IOS_ARCH)