diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-12-12 12:46:24 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-12-12 22:34:52 +0200 |
| commit | ce5ed9e6498a832f070400fb281e46cd04e39ea1 (patch) | |
| tree | 68b51821738b03558da85d981903b4febb3e39af /platform/android | |
| parent | eff986bfc42c450ebca075a9a2b59940d5cd8e33 (diff) | |
| download | qtlocation-mapboxgl-ce5ed9e6498a832f070400fb281e46cd04e39ea1.tar.gz | |
[build] ICU is now configured per platform
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/config.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake index 32745720e5..635c27a44f 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -25,6 +25,7 @@ mason_use(libzip VERSION 1.1.3) mason_use(nunicode VERSION 1.7.1) mason_use(sqlite VERSION 3.14.2) mason_use(gtest VERSION 1.7.0) +mason_use(icu VERSION 58.1) set(ANDROID_SDK_PROJECT_DIR ${CMAKE_SOURCE_DIR}/platform/android/MapboxGLAndroidSDK) set(ANDROID_JNI_TARGET_DIR ${ANDROID_SDK_PROJECT_DIR}/src/main/jniLibs/${ANDROID_JNIDIR}) @@ -77,6 +78,7 @@ macro(mbgl_platform_core) # Misc PRIVATE platform/android/src/logging_android.cpp PRIVATE platform/default/string_stdlib.cpp + PRIVATE platform/default/bidi.cpp # Image handling PRIVATE platform/default/image.cpp @@ -163,6 +165,7 @@ macro(mbgl_platform_core) target_add_mason_package(mbgl-core PUBLIC geojson) target_add_mason_package(mbgl-core PUBLIC jni.hpp) target_add_mason_package(mbgl-core PUBLIC rapidjson) + target_add_mason_package(mbgl-core PUBLIC icu) target_compile_options(mbgl-core PRIVATE -fvisibility=hidden |