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/qt | |
| parent | eff986bfc42c450ebca075a9a2b59940d5cd8e33 (diff) | |
| download | qtlocation-mapboxgl-ce5ed9e6498a832f070400fb281e46cd04e39ea1.tar.gz | |
[build] ICU is now configured per platform
Diffstat (limited to 'platform/qt')
| -rw-r--r-- | platform/qt/config.cmake | 4 | ||||
| -rw-r--r-- | platform/qt/qt.cmake | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake index 30781fa428..f6b7d509f8 100644 --- a/platform/qt/config.cmake +++ b/platform/qt/config.cmake @@ -2,6 +2,7 @@ include(platform/qt/qt.cmake) mason_use(sqlite VERSION 3.14.2) mason_use(gtest VERSION 1.7.0${MASON_CXXABI_SUFFIX}) +mason_use(icu VERSION 58.1) if(NOT WITH_QT_DECODERS) mason_use(libjpeg-turbo VERSION 1.5.0) @@ -38,6 +39,9 @@ macro(mbgl_platform_core) else() add_definitions(-DQT_IMAGE_DECODERS) endif() + + target_add_mason_package(mbgl-core PRIVATE icu) + endmacro() macro(mbgl_platform_test) diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index 3efdf6cad8..c640ca5689 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -29,6 +29,7 @@ set(MBGL_QT_FILES # Misc PRIVATE platform/default/logging_stderr.cpp + PRIVATE platform/default/bidi.cpp # Thread pool PRIVATE platform/default/mbgl/util/default_thread_pool.cpp |