diff options
| author | Jordan Kiley <jmkiley@users.noreply.github.com> | 2020-01-09 12:41:14 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-09 12:41:14 -0800 |
| commit | 60a4b3eda3d2d144a5845505649beeaefde6055b (patch) | |
| tree | 27899478bb800b293ae1b45484be17b1c04ed1ff | |
| parent | 52edd9b43bfa2368c99d221538adfa824164d66f (diff) | |
| download | qtlocation-mapboxgl-60a4b3eda3d2d144a5845505649beeaefde6055b.tar.gz | |
[ios] Add native_apple_interface to ios.cmake (#16103)
* [ios] Add native_apple_interface to ios.cmake
* [ios] Use Xcode for next-macos-xcode11-release
| -rw-r--r-- | circle.yml | 2 | ||||
| -rw-r--r-- | next/platform/ios/ios.cmake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/circle.yml b/circle.yml index 0276c44ec7..96575c9781 100644 --- a/circle.yml +++ b/circle.yml @@ -143,7 +143,7 @@ workflows: name: next-ios-xcode11-release executor_name: macos-11_0_0 target_is_macos: true - config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_SYSROOT=iphonesimulator' + config_params: '-G Xcode -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_SYSROOT=iphonesimulator' test_params: '-Q -N' mbgl-legacy: jobs: diff --git a/next/platform/ios/ios.cmake b/next/platform/ios/ios.cmake index 10a6839c9d..f2ab071812 100644 --- a/next/platform/ios/ios.cmake +++ b/next/platform/ios/ios.cmake @@ -24,6 +24,7 @@ target_sources( ${MBGL_ROOT}/platform/darwin/src/gl_functions.cpp ${MBGL_ROOT}/platform/darwin/src/headless_backend_eagl.mm ${MBGL_ROOT}/platform/darwin/src/http_file_source.mm + ${MBGL_ROOT}/platform/darwin/src/native_apple_interface.m ${MBGL_ROOT}/platform/darwin/src/image.mm ${MBGL_ROOT}/platform/darwin/src/local_glyph_rasterizer.mm ${MBGL_ROOT}/platform/darwin/src/logging_nslog.mm |