summaryrefslogtreecommitdiff
path: root/next/platform/ios/ios.cmake
diff options
context:
space:
mode:
Diffstat (limited to 'next/platform/ios/ios.cmake')
-rw-r--r--next/platform/ios/ios.cmake8
1 files changed, 1 insertions, 7 deletions
diff --git a/next/platform/ios/ios.cmake b/next/platform/ios/ios.cmake
index 9f50f6a529..29cf4a5ca0 100644
--- a/next/platform/ios/ios.cmake
+++ b/next/platform/ios/ios.cmake
@@ -94,8 +94,7 @@ target_link_libraries(
)
if(MBGL_IOS_RENDER_TEST)
- set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
-
+ set(CMAKE_OSX_ARCHITECTURES "armv7;i386;x86_64;arm64")
set(PREPARE_CMD "${MBGL_ROOT}/render-test/ios/setup_test_data.sh")
message("COMMAND: ${PREPARE_CMD}")
execute_process(COMMAND ${PREPARE_CMD} RESULT_VARIABLE CMD_ERROR)
@@ -103,8 +102,6 @@ if(MBGL_IOS_RENDER_TEST)
set(RESOURCES ${MBGL_ROOT}/render-test/ios/Main.storyboard ${MBGL_ROOT}/render-test/ios/LaunchScreen.storyboard ${MBGL_ROOT}/test-data)
- set(PUBLIC_HEADER ${MBGL_ROOT}/render-test/ios/iosTestRunner.h)
-
add_executable(
RenderTestApp
${MBGL_ROOT}/render-test/ios/ios_test_runner.hpp
@@ -118,10 +115,7 @@ if(MBGL_IOS_RENDER_TEST)
${MBGL_ROOT}/render-test/ios/main.m
${RESOURCES}
)
-
initialize_ios_target(RenderTestApp)
- # Turn on ARC
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fobjc-arc")
set_target_properties(
RenderTestApp