diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-08-13 17:17:17 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-08-14 16:45:52 +0300 |
| commit | 05eeb78e4d3acaafa16239772650a2c54e12131e (patch) | |
| tree | 0c907aa8b292829b517ea454c7483076ec8a1e7d /cmake | |
| parent | 234b5069fc579b19e64b2dda327346710f958b29 (diff) | |
| download | qtlocation-mapboxgl-upstream/mapbox-icu.tar.gz | |
[build] Replace vendor/icu with vendor/mapbox-icuupstream/mapbox-icu
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/mason-dependencies.cmake | 1 | ||||
| -rw-r--r-- | cmake/vendor.cmake | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cmake/mason-dependencies.cmake b/cmake/mason-dependencies.cmake index 5ec6a44a79..a6ef7a3a53 100644 --- a/cmake/mason-dependencies.cmake +++ b/cmake/mason-dependencies.cmake @@ -8,7 +8,6 @@ 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) diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake index 0b164434c9..a0399cbf48 100644 --- a/cmake/vendor.cmake +++ b/cmake/vendor.cmake @@ -13,7 +13,6 @@ include(${CMAKE_SOURCE_DIR}/vendor/filesystem.cmake) include(${CMAKE_SOURCE_DIR}/vendor/geojson-vt-cpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/geojson.hpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/googletest.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/icu.cmake) include(${CMAKE_SOURCE_DIR}/vendor/jni.hpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/kdbush.hpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/nunicode.cmake) @@ -32,6 +31,10 @@ if(NOT TARGET mapbox-base) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/vendor/mapbox-base ${CMAKE_BINARY_DIR}/.build-mapbox-gl-native-mapbox-base) endif() +if(NOT TARGET mapbox-icu) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/vendor/mapbox-icu ${CMAKE_BINARY_DIR}/.build-mapbox-gl-native-mapbox-icu) +endif() + if(MBGL_PLATFORM STREQUAL "linux" OR MBGL_PLATFORM STREQUAL "macos") include(${CMAKE_SOURCE_DIR}/vendor/glfw.cmake) endif() |