diff options
| author | zmiao <miao.zhao@mapbox.com> | 2020-01-14 16:26:52 +0200 |
|---|---|---|
| committer | zmiao <miao.zhao@mapbox.com> | 2020-01-21 16:55:02 +0200 |
| commit | 4029cbef3d75135e8cc915ac47e07055c2b46fde (patch) | |
| tree | 6219cbc1e19d331c19851bb1d553fa82f5134489 | |
| parent | 4a4f711a92b133bd4c4080f5777565d50059f70b (diff) | |
| download | qtlocation-mapboxgl-4029cbef3d75135e8cc915ac47e07055c2b46fde.tar.gz | |
Enable bitcode
| -rw-r--r-- | next/platform/ios/ios.cmake | 13 | ||||
| -rw-r--r-- | next/render-test/CMakeLists.txt | 7 |
2 files changed, 17 insertions, 3 deletions
diff --git a/next/platform/ios/ios.cmake b/next/platform/ios/ios.cmake index 287ba141b5..dac4586df9 100644 --- a/next/platform/ios/ios.cmake +++ b/next/platform/ios/ios.cmake @@ -9,8 +9,8 @@ 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_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() @@ -172,7 +172,14 @@ if(IOS_RENDER_TESTING) xctest_add_bundle(RenderTestAppTests RenderTestApp ${MBGL_ROOT}/render-test/ios/tests/Tests.m) - initialize_ios_target(RenderTestAppTests) + set_target_properties( + RenderTestAppTests + PROPERTIES + XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET + "${IOS_DEPLOYMENT_TARGET}" + XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH + $<$<CONFIG:Debug>:YES> + ) target_include_directories( RenderTestAppTests diff --git a/next/render-test/CMakeLists.txt b/next/render-test/CMakeLists.txt index d8622d0382..7949c2b3cb 100644 --- a/next/render-test/CMakeLists.txt +++ b/next/render-test/CMakeLists.txt @@ -18,6 +18,13 @@ add_library( ${MBGL_ROOT}/render-test/runner.hpp ) +if(CMAKE_SYSTEM_NAME STREQUAL iOS) + set_target_properties(mbgl-render-test PROPERTIES XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "${IOS_DEPLOYMENT_TARGET}") + set_target_properties(mbgl-render-test PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE "YES") + set_target_properties(mbgl-render-test PROPERTIES XCODE_ATTRIBUTE_BITCODE_GENERATION_MODE bitcode) + set_target_properties(mbgl-render-test PROPERTIES XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH $<$<CONFIG:Debug>:YES>) +endif() + # FIXME: Should not use core private interface target_include_directories( mbgl-render-test |