diff options
| author | Chris Loer <chris.loer@gmail.com> | 2018-06-27 15:01:54 -0700 |
|---|---|---|
| committer | Chris Loer <chris.loer@mapbox.com> | 2018-07-03 10:03:05 -0700 |
| commit | 251f5e605f1f1bb3e56115f8cef66cacabfd9d83 (patch) | |
| tree | 55c81152898be05016ed8a55e975e0998719191d /platform/linux | |
| parent | 71a72d269a3f0de6f3cdb7780d2bf44f6a4e2c21 (diff) | |
| download | qtlocation-mapboxgl-251f5e605f1f1bb3e56115f8cef66cacabfd9d83.tar.gz | |
[core, vendor] Create vendored nunicode 1.8.
- Version bump to 1.8 necessary for "unaccent" functionality
- Qt now depends on nunicode, ruling out use of precompiled binaries
Diffstat (limited to 'platform/linux')
| -rw-r--r-- | platform/linux/config.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index 1a8fbff7b2..fe4cd5fcc3 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -1,7 +1,8 @@ +include(cmake/nunicode.cmake) + mason_use(glfw VERSION 2018-06-27-0be4f3f) mason_use(sqlite VERSION 3.14.2) mason_use(libuv VERSION 1.9.1) -mason_use(nunicode VERSION 1.7.1) mason_use(libpng VERSION 1.6.25) mason_use(libjpeg-turbo VERSION 1.5.0) mason_use(webp VERSION 0.5.1) @@ -85,13 +86,13 @@ macro(mbgl_platform_core) PRIVATE platform/linux ) - target_add_mason_package(mbgl-core PUBLIC nunicode) target_add_mason_package(mbgl-core PUBLIC libpng) target_add_mason_package(mbgl-core PUBLIC libjpeg-turbo) target_add_mason_package(mbgl-core PUBLIC webp) target_add_mason_package(mbgl-core PRIVATE icu) target_link_libraries(mbgl-core + PRIVATE nunicode PUBLIC -lz ) |