diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-12-12 16:50:48 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-12-12 22:34:52 +0200 |
| commit | b65b2f1c299eb545ae0dab454c51f11c5833fdd8 (patch) | |
| tree | dc5d610af16e4a4397bfc5dc7651073e1490fe03 /platform/qt/config.cmake | |
| parent | c0e18ad80c56d6197cb0e5f1e29384ad54491dbb (diff) | |
| download | qtlocation-mapboxgl-b65b2f1c299eb545ae0dab454c51f11c5833fdd8.tar.gz | |
[qt] Skip ICU if WITH_QT_I18N is set
Diffstat (limited to 'platform/qt/config.cmake')
| -rw-r--r-- | platform/qt/config.cmake | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake index f6b7d509f8..f2beedcfa2 100644 --- a/platform/qt/config.cmake +++ b/platform/qt/config.cmake @@ -2,7 +2,6 @@ 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) @@ -10,6 +9,10 @@ if(NOT WITH_QT_DECODERS) mason_use(webp VERSION 0.5.1) endif() +if(NOT WITH_QT_I18N) + mason_use(icu VERSION 58.1) +endif() + macro(mbgl_platform_core) target_sources(mbgl-core ${MBGL_QT_FILES} @@ -40,7 +43,12 @@ macro(mbgl_platform_core) add_definitions(-DQT_IMAGE_DECODERS) endif() - target_add_mason_package(mbgl-core PRIVATE icu) + if(NOT WITH_QT_I18N) + target_sources(mbgl-core PRIVATE platform/default/bidi.cpp) + target_add_mason_package(mbgl-core PRIVATE icu) + else() + target_sources(mbgl-core PRIVATE platform/qt/src/bidi.cpp) + endif() endmacro() |