From 14b439c5b2e9690c5bcfefab0fcdb8ade395cdd4 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 17 Oct 2018 15:34:21 -0700 Subject: [PATCH] Enable build for iOS in Pipelines. (#925) --- .gitignore | 11 +- Build_iOS/CMakeLists.txt | 61 ++---- Build_iOS/configure.sh | 68 ++++--- Build_iOS/fix_boost_building_script.patch | 13 -- Build_iOS/iOS.cmake | 225 ---------------------- azure-pipelines.yml | 8 + 6 files changed, 68 insertions(+), 318 deletions(-) delete mode 100644 Build_iOS/fix_boost_building_script.patch delete mode 100644 Build_iOS/iOS.cmake diff --git a/.gitignore b/.gitignore index 49f694a391..f3e8ec47da 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -#Visual Studio files +# Visual Studio files *.o *.d *.so @@ -38,7 +38,7 @@ *~ ipch/ obj/ -#OSX files +# OSX files *.xccheckout *.pbxuser *.mode1v3 @@ -67,7 +67,8 @@ Intermediate/ # Ignore cmake building directories build.*/ docs/ -# ignore NuGet artifacts +# Ignore NuGet artifacts .nuget/ - -Generated Files/ \ No newline at end of file +Generated Files/ +# Ignore iOS temp build directories +Build_iOS/Apple-Boost-BuildScript \ No newline at end of file diff --git a/Build_iOS/CMakeLists.txt b/Build_iOS/CMakeLists.txt index 1c1ea90152..3c1e37c130 100644 --- a/Build_iOS/CMakeLists.txt +++ b/Build_iOS/CMakeLists.txt @@ -1,5 +1,5 @@ project(casablanca-ios NONE) -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 3.1) enable_testing() @@ -7,33 +7,18 @@ if (CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET) set (ENV{CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET} ${CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET}) endif() -set(TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/iOS.cmake") - -set(SIM_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build.i386" CACHE INTERNAL "") -set(SIM_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../Release" CACHE INTERNAL "") +set(TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/ios-cmake/ios.toolchain.cmake") set(SIM64_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build.x86_64" CACHE INTERNAL "") set(SIM64_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../Release" CACHE INTERNAL "") -set(ARM_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build.arm" CACHE INTERNAL "") -set(ARM_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../Release" CACHE INTERNAL "") +set(ARM64_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build.arm64" CACHE INTERNAL "") +set(ARM64_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../Release" CACHE INTERNAL "") add_test(NAME ios_runner WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../Release/tests/common/testrunner/ios COMMAND xcodebuild test -project ios_runner.xcodeproj -configuration=${CMAKE_BUILD_TYPE} -scheme ios_runner -destination "platform=iOS Simulator,name=iPhone 6" LIBRARY_SEARCH_PATH=${SIM_BINARY_DIR} ) -file(MAKE_DIRECTORY ${SIM_BINARY_DIR}) -execute_process(WORKING_DIRECTORY ${SIM_BINARY_DIR} - COMMAND ${CMAKE_COMMAND} - -GXcode - -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} - -DIOS_PLATFORM=SIMULATOR - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DCMAKE_C_COMPILER=${CLANG_C_COMPILER} - -DCMAKE_CXX_COMPILER=${CLANG_CXX_COMPILER} - "${SIM_SOURCE_DIR}" - ) - file(MAKE_DIRECTORY ${SIM64_BINARY_DIR}) execute_process(WORKING_DIRECTORY ${SIM64_BINARY_DIR} COMMAND ${CMAKE_COMMAND} @@ -41,33 +26,20 @@ execute_process(WORKING_DIRECTORY ${SIM64_BINARY_DIR} -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} -DIOS_PLATFORM=SIMULATOR64 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DCMAKE_C_COMPILER=${CLANG_C_COMPILER} - -DCMAKE_CXX_COMPILER=${CLANG_CXX_COMPILER} "${SIM64_SOURCE_DIR}" ) -file(MAKE_DIRECTORY ${ARM_BINARY_DIR}) -execute_process(WORKING_DIRECTORY ${ARM_BINARY_DIR} +file(MAKE_DIRECTORY ${ARM64_BINARY_DIR}) +execute_process(WORKING_DIRECTORY ${ARM64_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -GXcode -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} - -DIOS_PLATFORM=OS + -DIOS_PLATFORM=OS64 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DCMAKE_C_COMPILER=${CLANG_C_COMPILER} - -DCMAKE_CXX_COMPILER=${CLANG_CXX_COMPILER} - "${ARM_SOURCE_DIR}" + "${ARM64_SOURCE_DIR}" ) -## Simulator i386 version -add_custom_target(sim - COMMAND ${CMAKE_COMMAND} - --build ${SIM_BINARY_DIR} - --config ${CMAKE_BUILD_TYPE} - COMMENT "Building for i386 (simulator)" - VERBATIM -) - ## Simulator x86_64 version add_custom_target(sim64 COMMAND ${CMAKE_COMMAND} @@ -77,12 +49,12 @@ add_custom_target(sim64 VERBATIM ) -## ARM version -add_custom_target(arm +## ARM64 version +add_custom_target(arm64 COMMAND ${CMAKE_COMMAND} - --build ${ARM_BINARY_DIR} + --build ${ARM64_BINARY_DIR} --config ${CMAKE_BUILD_TYPE} - COMMENT "Building for armv7, armv7s, arm64" + COMMENT "Building for arm64" VERBATIM ) @@ -91,16 +63,13 @@ add_custom_command( OUTPUT ${LIB_CPPREST} COMMAND lipo -create -output "${CMAKE_CURRENT_BINARY_DIR}/${LIB_CPPREST}" - ${SIM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/${LIB_CPPREST} ${SIM64_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/${LIB_CPPREST} - ${ARM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/${LIB_CPPREST} + ${ARM64_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/${LIB_CPPREST} DEPENDS - sim sim64 - arm - "${SIM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/${LIB_CPPREST}" + arm64 "${SIM64_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/${LIB_CPPREST}" - "${ARM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/${LIB_CPPREST}" + "${ARM64_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/${LIB_CPPREST}" VERBATIM ) diff --git a/Build_iOS/configure.sh b/Build_iOS/configure.sh index 8b0599512c..1c97e5c238 100755 --- a/Build_iOS/configure.sh +++ b/Build_iOS/configure.sh @@ -2,42 +2,52 @@ set -e if [ ! -e boost.framework ] - then - git clone -n https://github.com/faithfracture/Apple-Boost-BuildScript Apple-Boost-BuildScript - pushd Apple-Boost-BuildScript - git checkout 86f7570fceaef00846cc75f59c61474758fc65cb - BOOST_LIBS="thread chrono filesystem regex system random" ./boost.sh - popd - mv Apple-Boost-BuildScript/build/boost/1.63.0/ios/framework/boost.framework . - mv boost.framework/Versions/A/Headers boost.headers - mkdir -p boost.framework/Versions/A/Headers - mv boost.headers boost.framework/Versions/A/Headers/boost +then + git clone https://github.com/faithfracture/Apple-Boost-BuildScript Apple-Boost-BuildScript + pushd ./Apple-Boost-BuildScript + git checkout 1b94ec2e2b5af1ee036d9559b96e70c113846392 + BOOST_LIBS="thread chrono filesystem regex system random" ./boost.sh -ios -tvos + popd + mv Apple-Boost-BuildScript/build/boost/1.67.0/ios/framework/boost.framework . + mv boost.framework/Versions/A/Headers boost.headers + mkdir -p boost.framework/Versions/A/Headers + mv boost.headers boost.framework/Versions/A/Headers/boost fi if [ ! -e openssl/lib/libcrypto.a ] - then - git clone --depth=1 https://github.com/x2on/OpenSSL-for-iPhone.git - pushd OpenSSL-for-iPhone - ./build-libssl.sh - popd - mkdir -p openssl/lib - cp -r OpenSSL-for-iPhone/bin/iPhoneOS9.2-armv7.sdk/include openssl - cp OpenSSL-for-iPhone/include/LICENSE openssl - lipo -create -output openssl/lib/libssl.a OpenSSL-for-iPhone/bin/iPhone*/lib/libssl.a - lipo -create -output openssl/lib/libcrypto.a OpenSSL-for-iPhone/bin/iPhone*/lib/libcrypto.a +then + git clone --depth=1 https://github.com/x2on/OpenSSL-for-iPhone.git + pushd OpenSSL-for-iPhone + git checkout 10019638e80e8a8a5fc19642a840d8a69fac7349 + ./build-libssl.sh + popd + mkdir -p openssl/lib + if [ -e OpenSSL-for-iPhone/bin/iPhoneOS11.4-arm64.sdk/include ] + then + cp -r OpenSSL-for-iPhone/bin/iPhoneOS11.4-arm64.sdk/include openssl + elif [ -e OpenSSL-for-iPhone/bin/iPhoneOS12.0-arm64.sdk/include ] + then + cp -r OpenSSL-for-iPhone/bin/iPhoneOS12.0-arm64.sdk/include openssl + else + echo 'Could not find OpenSSL for iPhone' + exit 1 + fi + cp OpenSSL-for-iPhone/include/LICENSE openssl + lipo -create -output openssl/lib/libssl.a OpenSSL-for-iPhone/bin/iPhone*/lib/libssl.a + lipo -create -output openssl/lib/libcrypto.a OpenSSL-for-iPhone/bin/iPhone*/lib/libcrypto.a fi -if [ ! -e ios-cmake/toolchain/iOS.cmake ] - then - git clone https://github.com/cristeab/ios-cmake.git - pushd ios-cmake - git apply ../fix_ios_cmake_compiler.patch - popd +if [ ! -e ios-cmake/ios.toolchain.cmake ] +then + git clone https://github.com/leetal/ios-cmake + pushd ios-cmake + git checkout 6b30f4cfeab5567041d38e79507e642056fb9fd4 + popd fi -mkdir -p build.ios -pushd build.ios -cmake .. -DCMAKE_BUILD_TYPE=Release +mkdir -p build.release.ios +pushd build.release.ios +cmake -DCMAKE_BUILD_TYPE=Release .. make popd echo "====" diff --git a/Build_iOS/fix_boost_building_script.patch b/Build_iOS/fix_boost_building_script.patch deleted file mode 100644 index a7f7b432a6..0000000000 --- a/Build_iOS/fix_boost_building_script.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/boost.sh b/boost.sh -index 2d5c05d..5c10ee9 100644 ---- a/boost.sh -+++ b/boost.sh -@@ -26,7 +26,7 @@ - # - #=============================================================================== - --BOOST_LIBS="atomic chrono date_time exception filesystem program_options random signals system test thread" -+BOOST_LIBS="chrono filesystem random regex system thread" - - BUILD_IOS= - BUILD_OSX= diff --git a/Build_iOS/iOS.cmake b/Build_iOS/iOS.cmake deleted file mode 100644 index 7001592b30..0000000000 --- a/Build_iOS/iOS.cmake +++ /dev/null @@ -1,225 +0,0 @@ -# This file is based off of the Platform/Darwin.cmake and Platform/UnixPaths.cmake -# files which are included with CMake 2.8.4 -# It has been altered for iOS development - -# Options: -# -# IOS_PLATFORM = OS (default) or SIMULATOR or SIMULATOR64 -# 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. -# -# 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. -# If set manually, it will override the default location and force the user of a particular Developer Platform -# -# CMAKE_IOS_SDK_ROOT = automatic(default) or /path/to/platform/Developer/SDKs/SDK folder -# By default this location is automatcially chosen based on the CMAKE_IOS_DEVELOPER_ROOT value. -# In this case it will always be the most up-to-date SDK found in the CMAKE_IOS_DEVELOPER_ROOT path. -# If set manually, this will force the use of a specific SDK version - -# Macros: -# -# set_xcode_property (TARGET XCODE_PROPERTY XCODE_VALUE) -# A convenience macro for setting xcode specific properties on targets -# example: set_xcode_property (myioslib IPHONEOS_DEPLOYMENT_TARGET "3.1") -# -# find_host_package (PROGRAM ARGS) -# A macro used to find executable programs on the host system, not within the iOS environment. -# Thanks to the android-cmake project for providing the command - -# Standard settings -set (CMAKE_SYSTEM_NAME Darwin) -set (CMAKE_SYSTEM_VERSION 1) -set (UNIX True) -set (APPLE True) -set (IOS True) - -# Required as of cmake 2.8.10 -set (CMAKE_OSX_DEPLOYMENT_TARGET "" CACHE STRING "Force unset of the deployment target for iOS" FORCE) - -# Allow external setting of CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET. This is clumsy -# but it provides flexibility of not having to hardcode the deployment version in the file or have -# numerous copies of the file -if ($ENV{CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET}) - set(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET $ENV{CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET}) -endif ($ENV{CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET}) - -# Determine the cmake host system version so we know where to find the iOS SDKs -find_program (CMAKE_UNAME uname /bin /usr/bin /usr/local/bin) -if (CMAKE_UNAME) - exec_program(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION) - string (REGEX REPLACE "^([0-9]+)\\.([0-9]+).*$" "\\1" DARWIN_MAJOR_VERSION "${CMAKE_HOST_SYSTEM_VERSION}") -endif (CMAKE_UNAME) - -# Use clang. Use xcrun to determine the location -EXEC_PROGRAM(xcrun ARGS -find clang OUTPUT_VARIABLE APPLE_CLANG) -EXEC_PROGRAM(xcrun ARGS -find clang++ OUTPUT_VARIABLE APPLE_CLANGPP) -set (CMAKE_C_COMPILER ${APPLE_CLANG}) -set (CMAKE_CXX_COMPILER ${APPLE_CLANGPP}) - -set (CMAKE_AR ar CACHE FILEPATH "" FORCE) - -set (CMAKE_THREAD_LIBS_INIT "-lpthread") -set (CMAKE_HAVE_THREADS_LIBRARY 1) -set (CMAKE_USE_WIN32_THREADS_INIT 0) -set (CMAKE_USE_PTHREADS_INIT 1) - -# Skip the platform compiler checks for cross compiling -set (CMAKE_CXX_COMPILER_WORKS TRUE) -set (CMAKE_C_COMPILER_WORKS TRUE) - -# All iOS/Darwin specific settings - some may be redundant -set (CMAKE_SHARED_LIBRARY_PREFIX "lib") -set (CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") -set (CMAKE_SHARED_MODULE_PREFIX "lib") -set (CMAKE_SHARED_MODULE_SUFFIX ".so") -set (CMAKE_MODULE_EXISTS 1) -set (CMAKE_DL_LIBS "") - -set (CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ") -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}") - -# Hidden visibilty is required for cxx on iOS -set (CMAKE_C_FLAGS_INIT "") -set (CMAKE_CXX_FLAGS_INIT "-fvisibility=hidden") - -set (CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "" CACHE STRING "Force unset of CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN" FORCE) - -set (CMAKE_C_LINK_FLAGS "-Wl,-search_paths_first ${CMAKE_C_LINK_FLAGS}") -set (CMAKE_CXX_LINK_FLAGS "-Wl,-search_paths_first ${CMAKE_CXX_LINK_FLAGS}") - -set (CMAKE_PLATFORM_HAS_INSTALLNAME 1) -set (CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-dynamiclib -headerpad_max_install_names") -set (CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names") -set (CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") -set (CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") -set (CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a") -set (CMAKE_MACOSX_BUNDLE ON) -set (CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED OFF) - - -# hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree -# (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache -# and still cmake didn't fail in CMakeFindBinUtils.cmake (because it isn't rerun) -# hardcode CMAKE_INSTALL_NAME_TOOL here to install_name_tool, so it behaves as it did before, Alex -if (NOT DEFINED CMAKE_INSTALL_NAME_TOOL) - find_program(CMAKE_INSTALL_NAME_TOOL install_name_tool) -endif (NOT DEFINED CMAKE_INSTALL_NAME_TOOL) - -# Setup iOS platform unless specified manually with IOS_PLATFORM -if (NOT DEFINED IOS_PLATFORM) - set (IOS_PLATFORM "OS") -endif (NOT DEFINED IOS_PLATFORM) -set (IOS_PLATFORM ${IOS_PLATFORM} CACHE STRING "Type of iOS Platform") - -# Setup building for arm64 or not -if (NOT DEFINED BUILD_ARM64) - set (BUILD_ARM64 true) -endif (NOT DEFINED BUILD_ARM64) -set (BUILD_ARM64 ${BUILD_ARM64} CACHE STRING "Build arm64 arch or not") - -# Check the platform selection and setup for developer root -if (${IOS_PLATFORM} STREQUAL "OS") - set (IOS_PLATFORM_LOCATION "iPhoneOS.platform") - - # This causes the installers to properly locate the output libraries - set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos") -elseif (${IOS_PLATFORM} STREQUAL "SIMULATOR") - set (IOS_PLATFORM_LOCATION "iPhoneSimulator.platform") - - # This causes the installers to properly locate the output libraries - set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator") -elseif (${IOS_PLATFORM} STREQUAL "SIMULATOR64") - 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 selected. Please choose OS or SIMULATOR") -endif (${IOS_PLATFORM} STREQUAL "OS") - -# Setup iOS developer location unless specified manually with CMAKE_IOS_DEVELOPER_ROOT -# Note Xcode 4.3 changed the installation location, choose the most recent one available -exec_program(/usr/bin/xcode-select ARGS -print-path OUTPUT_VARIABLE CMAKE_XCODE_DEVELOPER_DIR) -set (XCODE_POST_43_ROOT "${CMAKE_XCODE_DEVELOPER_DIR}/Platforms/${IOS_PLATFORM_LOCATION}/Developer") -set (XCODE_PRE_43_ROOT "/Developer/Platforms/${IOS_PLATFORM_LOCATION}/Developer") -if (NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT) - if (EXISTS ${XCODE_POST_43_ROOT}) - set (CMAKE_IOS_DEVELOPER_ROOT ${XCODE_POST_43_ROOT}) - elseif(EXISTS ${XCODE_PRE_43_ROOT}) - set (CMAKE_IOS_DEVELOPER_ROOT ${XCODE_PRE_43_ROOT}) - endif (EXISTS ${XCODE_POST_43_ROOT}) -endif (NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT) -set (CMAKE_IOS_DEVELOPER_ROOT ${CMAKE_IOS_DEVELOPER_ROOT} CACHE PATH "Location of iOS Platform") - -# Find and use the most recent iOS sdk unless specified manually with CMAKE_IOS_SDK_ROOT -if (NOT DEFINED CMAKE_IOS_SDK_ROOT) - file (GLOB _CMAKE_IOS_SDKS "${CMAKE_IOS_DEVELOPER_ROOT}/SDKs/*") - if (_CMAKE_IOS_SDKS) - list (SORT _CMAKE_IOS_SDKS) - list (REVERSE _CMAKE_IOS_SDKS) - list (GET _CMAKE_IOS_SDKS 0 CMAKE_IOS_SDK_ROOT) - else (_CMAKE_IOS_SDKS) - message (FATAL_ERROR "No iOS SDK's found in default search path ${CMAKE_IOS_DEVELOPER_ROOT}. Manually set CMAKE_IOS_SDK_ROOT or install the iOS SDK.") - endif (_CMAKE_IOS_SDKS) - message (STATUS "Toolchain using default iOS SDK: ${CMAKE_IOS_SDK_ROOT}") -endif (NOT DEFINED CMAKE_IOS_SDK_ROOT) -set (CMAKE_IOS_SDK_ROOT ${CMAKE_IOS_SDK_ROOT} CACHE PATH "Location of the selected iOS SDK") - -# Set the sysroot default to the most recent SDK -set (CMAKE_OSX_SYSROOT ${CMAKE_IOS_SDK_ROOT} CACHE PATH "Sysroot used for iOS support") - -# set the architecture for iOS -if (${IOS_PLATFORM} STREQUAL "OS") - set (IOS_ARCH armv7 armv7s 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") - -# 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") - -# default to searching for frameworks first -set (CMAKE_FIND_FRAMEWORK FIRST) - -# set up the default search directories for frameworks -set (CMAKE_SYSTEM_FRAMEWORK_PATH - ${CMAKE_IOS_SDK_ROOT}/System/Library/Frameworks - ${CMAKE_IOS_SDK_ROOT}/System/Library/PrivateFrameworks - ${CMAKE_IOS_SDK_ROOT}/Developer/Library/Frameworks -) - -# only search the iOS sdks, not the remainder of the host filesystem -set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) -set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) - - -# This little macro lets you set any XCode specific property -macro (set_xcode_property TARGET XCODE_PROPERTY XCODE_VALUE) - set_property (TARGET ${TARGET} PROPERTY XCODE_ATTRIBUTE_${XCODE_PROPERTY} ${XCODE_VALUE}) -endmacro (set_xcode_property) - - -# This macro lets you find executable programs on the host system -macro (find_host_package) - set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) - set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER) - set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER) - set (IOS FALSE) - - find_package(${ARGN}) - - set (IOS TRUE) - set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) - set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) - set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -endmacro (find_host_package) - diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a5d63c55df..198df70a30 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -285,3 +285,11 @@ jobs: cd build.release/Release/Binaries ./test_runner *test.dylib displayName: 'Run tests, release' + - job: MacOS_iOS + pool: + vmImage: 'macOS-10.13' + steps: + - script: | + cd Build_iOS + ./configure.sh + displayName: 'Build for iOS' \ No newline at end of file