diff options
| author | zmiao <miao.zhao@mapbox.com> | 2020-01-24 15:45:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-24 15:45:47 +0200 |
| commit | 429292fb9898cbcf3f2a0b644e01277473124252 (patch) | |
| tree | ebcdd55d269984af2aa10d2d15e73eacdf04e178 /next | |
| parent | 61ab64906e6ebca9fe27463d9ea12a747314386c (diff) | |
| download | qtlocation-mapboxgl-429292fb9898cbcf3f2a0b644e01277473124252.tar.gz | |
[test-runner] Add iOS RenderTestRunner test metrics (#16139)
* [test-runner] Add iOS RenderTestRunner test metrics
* [test-runner] Add ios probe metrics
Diffstat (limited to 'next')
| -rw-r--r-- | next/platform/ios/ios.cmake | 8 |
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 |