summaryrefslogtreecommitdiff
path: root/platform/ios
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-12-12 12:46:24 +0200
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-12-12 22:34:52 +0200
commitce5ed9e6498a832f070400fb281e46cd04e39ea1 (patch)
tree68b51821738b03558da85d981903b4febb3e39af /platform/ios
parenteff986bfc42c450ebca075a9a2b59940d5cd8e33 (diff)
downloadqtlocation-mapboxgl-ce5ed9e6498a832f070400fb281e46cd04e39ea1.tar.gz
[build] ICU is now configured per platform
Diffstat (limited to 'platform/ios')
-rw-r--r--platform/ios/config.cmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/platform/ios/config.cmake b/platform/ios/config.cmake
index 195687fea5..12db02921c 100644
--- a/platform/ios/config.cmake
+++ b/platform/ios/config.cmake
@@ -1,5 +1,7 @@
add_definitions(-DMBGL_USE_GLES2=1)
+mason_use(icu VERSION 58.1)
+
macro(mbgl_platform_core)
set_xcode_property(mbgl-core IPHONEOS_DEPLOYMENT_TARGET "8.0")
set_xcode_property(mbgl-core ENABLE_BITCODE "YES")
@@ -38,6 +40,7 @@ macro(mbgl_platform_core)
PRIVATE platform/darwin/src/logging_nslog.mm
PRIVATE platform/darwin/src/nsthread.mm
PRIVATE platform/darwin/src/string_nsstring.mm
+ PRIVATE platform/default/bidi.cpp
# Image handling
PRIVATE platform/darwin/src/image.mm
@@ -57,6 +60,7 @@ macro(mbgl_platform_core)
)
target_add_mason_package(mbgl-core PUBLIC geojson)
+ target_add_mason_package(mbgl-core PUBLIC icu)
target_compile_options(mbgl-core
PRIVATE -fobjc-arc