diff options
| author | Julian Rex <julian.rex@mapbox.com> | 2019-10-22 14:45:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-22 14:45:55 -0400 |
| commit | a4c2cdb507cf35041e4215a2e55eb2b9f9c84ccf (patch) | |
| tree | cdd9be5336f6633afb6a6e944dc6b20083b63414 | |
| parent | 068befa9df1c55904ec7e26bee062e5e33aecbce (diff) | |
| download | qtlocation-mapboxgl-a4c2cdb507cf35041e4215a2e55eb2b9f9c84ccf.tar.gz | |
[ios] Set xcode properties for cmake. (#15842)
* [ios] Set xcode properties for cmake.
* Fix Sanitize typo
| -rw-r--r-- | next/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | next/platform/ios/ios.cmake | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/next/CMakeLists.txt b/next/CMakeLists.txt index c45c2b8641..524a86e189 100644 --- a/next/CMakeLists.txt +++ b/next/CMakeLists.txt @@ -31,7 +31,7 @@ set(CMAKE_CXX_FLAGS_DEBUGCOVERAGE "${CMAKE_CXX_FLAGS_DEBUG} --coverage") set(CMAKE_C_FLAGS_DEBUGCOVERAGE "${CMAKE_CXX_FLAGS_DEBUG} --coverage") set(CMAKE_CXX_FLAGS_SANITIZE "-DSANITIZE -g -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize=${MBGL_WITH_SANITIZER}") -set(CMAKE_C_FLAGS_SANITIZE "-DSANITEIZE -g -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize=${MBGL_WITH_SANITIZER}") +set(CMAKE_C_FLAGS_SANITIZE "-DSANITIZE -g -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize=${MBGL_WITH_SANITIZER}") if(MBGL_WITH_QT) find_package(Qt5Core REQUIRED) diff --git a/next/platform/ios/ios.cmake b/next/platform/ios/ios.cmake index 4558b47b68..10a6839c9d 100644 --- a/next/platform/ios/ios.cmake +++ b/next/platform/ios/ios.cmake @@ -3,6 +3,17 @@ target_compile_definitions( PUBLIC MBGL_USE_GLES2 GLES_SILENCE_DEPRECATION ) +if(NOT DEFINED IOS_DEPLOYMENT_TARGET) + set(IOS_DEPLOYMENT_TARGET "9.0") +endif() + +macro(initialize_ios_target target) + set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "${IOS_DEPLOYMENT_TARGET}") + set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE "YES") + set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_BITCODE_GENERATION_MODE bitcode) + set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH $<$<CONFIG:Debug>:YES>) +endmacro() + set_target_properties(mbgl-core PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES) target_sources( @@ -52,6 +63,9 @@ target_include_directories( include(${PROJECT_SOURCE_DIR}/vendor/icu.cmake) +initialize_ios_target(mbgl-core) +initialize_ios_target(mbgl-vendor-icu) + target_link_libraries( mbgl-core PRIVATE @@ -73,3 +87,5 @@ target_link_libraries( sqlite3 z ) + +unset(IOS_DEPLOYMENT_TARGET CACHE) |