diff options
| author | Juha Alanen <juha.alanen@mapbox.com> | 2019-06-03 15:34:13 +0300 |
|---|---|---|
| committer | Juha Alanen <19551460+jmalanen@users.noreply.github.com> | 2019-06-27 15:51:22 +0300 |
| commit | 0ca8ea6f169149cd414a65f40d0f7bdd40f3cca3 (patch) | |
| tree | db6a58892dd6326b8ba22da7fc822d008bdda01a /cmake | |
| parent | 81ea5d020efd0257083bf323644a575f5ea800c9 (diff) | |
| download | qtlocation-mapboxgl-0ca8ea6f169149cd414a65f40d0f7bdd40f3cca3.tar.gz | |
[core] Add number-format expression
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/core.cmake | 7 | ||||
| -rw-r--r-- | cmake/mason-dependencies.cmake | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/cmake/core.cmake b/cmake/core.cmake index 1971352c37..3278c4f7d3 100644 --- a/cmake/core.cmake +++ b/cmake/core.cmake @@ -19,13 +19,18 @@ target_link_libraries(mbgl-core PRIVATE wagyu ) +# linux uses ICU from mason, other platforms use vendored ICU +if(NOT MBGL_PLATFORM STREQUAL "linux") + set(ICU_LIBRARY "icu") +endif() + # FIXME: We should not leak these many # libraries in our public interface. target_link_libraries(mbgl-core PUBLIC boost geojson.hpp geometry.hpp - icu + ${ICU_LIBRARY} optional polylabel protozero diff --git a/cmake/mason-dependencies.cmake b/cmake/mason-dependencies.cmake index a6ef7a3a53..5ec6a44a79 100644 --- a/cmake/mason-dependencies.cmake +++ b/cmake/mason-dependencies.cmake @@ -8,6 +8,7 @@ elseif(MBGL_PLATFORM STREQUAL "linux") mason_use(libuv VERSION 1.9.1) mason_use(libpng VERSION 1.6.25) mason_use(libjpeg-turbo VERSION 1.5.0) + mason_use(icu VERSION 63.1-min-static-data) if(WITH_EGL) mason_use(swiftshader VERSION 2018-05-31) |