summaryrefslogtreecommitdiff
path: root/platform/android
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2018-09-04 17:26:24 +0200
committerKonstantin Käfer <mail@kkaefer.com>2018-09-05 12:26:15 +0200
commite51eb0fc238e24e672f2ba803fed4d527791733f (patch)
treec8af2caaa4b496d21bfb51505f8bcce98b1cad6c /platform/android
parentf006eb972893368d1742379a5178f901bd2a0ec8 (diff)
downloadqtlocation-mapboxgl-e51eb0fc238e24e672f2ba803fed4d527791733f.tar.gz
[build] use vendored version of ICU
Diffstat (limited to 'platform/android')
-rw-r--r--platform/android/config.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake
index f0c3324cc4..d6be05095b 100644
--- a/platform/android/config.cmake
+++ b/platform/android/config.cmake
@@ -2,6 +2,7 @@ set(USE_GLES2 ON)
include(cmake/nunicode.cmake)
include(cmake/sqlite.cmake)
+include(cmake/icu.cmake)
# Build thin archives.
set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> cruT <TARGET> <LINK_FLAGS> <OBJECTS>")
@@ -46,10 +47,10 @@ 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 PRIVATE icu)
target_link_libraries(mbgl-core
PRIVATE nunicode
+ PRIVATE icu
PUBLIC expected
PUBLIC -llog
PUBLIC -landroid