From 251f5e605f1f1bb3e56115f8cef66cacabfd9d83 Mon Sep 17 00:00:00 2001 From: Chris Loer Date: Wed, 27 Jun 2018 15:01:54 -0700 Subject: [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 --- platform/android/config.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'platform/android/config.cmake') diff --git a/platform/android/config.cmake b/platform/android/config.cmake index c25e48de05..bb4fa3bfb6 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -1,5 +1,6 @@ add_definitions(-DMBGL_USE_GLES2=1) include(cmake/test-files.cmake) +include(cmake/nunicode.cmake) # Build thin archives. set(CMAKE_CXX_ARCHIVE_CREATE " cruT ") @@ -21,7 +22,6 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gc-sections -Wl,--ve set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--gc-sections -Wl,--version-script=${CMAKE_SOURCE_DIR}/platform/android/version-script") mason_use(jni.hpp VERSION 3.0.0 HEADER_ONLY) -mason_use(nunicode VERSION 1.7.1) mason_use(sqlite VERSION 3.14.2) mason_use(gtest VERSION 1.8.0) mason_use(icu VERSION 58.1-min-size) @@ -81,13 +81,13 @@ macro(mbgl_platform_core) PRIVATE platform/android ) - target_add_mason_package(mbgl-core PUBLIC nunicode) target_add_mason_package(mbgl-core PUBLIC geojson) target_add_mason_package(mbgl-core PUBLIC jni.hpp) target_add_mason_package(mbgl-core PUBLIC rapidjson) target_add_mason_package(mbgl-core PRIVATE icu) target_link_libraries(mbgl-core + PRIVATE nunicode PUBLIC -llog PUBLIC -landroid PUBLIC -ljnigraphics -- cgit v1.2.1