diff options
| author | zmiao <miao.zhao@mapbox.com> | 2020-01-21 15:29:04 +0200 |
|---|---|---|
| committer | zmiao <miao.zhao@mapbox.com> | 2020-01-21 16:55:02 +0200 |
| commit | 9698115ea9021f1b67d040665bb70f215ea76d35 (patch) | |
| tree | 2883b3417de59b70ce9ca58927a992fe5750eb82 | |
| parent | 31ed0375e68f153c59884039b93e9a5d8a58296d (diff) | |
| download | qtlocation-mapboxgl-upstream/zmiao-ios-test-runner.tar.gz | |
remove ios specific cmake optionupstream/zmiao-ios-test-runner
| -rw-r--r-- | circle.yml | 2 | ||||
| -rw-r--r-- | next/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | next/platform/ios/ios.cmake | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/circle.yml b/circle.yml index f4860b82ac..67276ed312 100644 --- a/circle.yml +++ b/circle.yml @@ -710,7 +710,7 @@ jobs: name: Build IOS RenderTestApp command: | cd render-test/ios - cmake ../../next -B Build -G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DIOS_RENDER_TESTING=ON + cmake ../../next -B Build -G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DMBGL_IOS_RENDER_TEST=ON cd Build xcodebuild -sdk iphoneos -project Mapbox\ GL\ Native.xcodeproj -scheme RenderTestApp build-for-testing -arch arm64 CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -configuration Release xcodebuild -sdk iphoneos -project Mapbox\ GL\ Native.xcodeproj build -target RenderTestAppTests -arch arm64 CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -configuration Release diff --git a/next/CMakeLists.txt b/next/CMakeLists.txt index 0427a26cf0..1950a1144a 100644 --- a/next/CMakeLists.txt +++ b/next/CMakeLists.txt @@ -22,7 +22,6 @@ option(MBGL_WITH_CORE_ONLY "Build only the core bits, no platform code" OFF) option(MBGL_WITH_COVERAGE "Enable code coverage collection" OFF) option(MBGL_WITH_QT "Build Mapbox GL Qt bindings" OFF) option(MBGL_WITH_SANITIZER "Use [address|thread|undefined] here" OFF) -option(IOS_RENDER_TESTING "Enable ios render test runner" OFF) add_library( mbgl-compiler-options INTERFACE diff --git a/next/platform/ios/ios.cmake b/next/platform/ios/ios.cmake index dac4586df9..9f50f6a529 100644 --- a/next/platform/ios/ios.cmake +++ b/next/platform/ios/ios.cmake @@ -93,7 +93,7 @@ target_link_libraries( z ) -if(IOS_RENDER_TESTING) +if(MBGL_IOS_RENDER_TEST) set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64") set(PREPARE_CMD "${MBGL_ROOT}/render-test/ios/setup_test_data.sh") |