summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2017-03-07 16:41:23 -0800
committerJohn Firebaugh <john.firebaugh@gmail.com>2017-03-08 14:05:19 -0800
commit3afae825c7b2f95e58cbcb85c59857f2253c945e (patch)
treeacac55f4d4942d60ed08758758f00ede0be59e80
parentb83b14feb0b99d669fb84a52ab356051368de637 (diff)
downloadqtlocation-mapboxgl-3afae825c7b2f95e58cbcb85c59857f2253c945e.tar.gz
Use ICU compiled with -Os
-rw-r--r--platform/android/config.cmake2
-rw-r--r--platform/ios/config.cmake2
-rw-r--r--platform/linux/config.cmake2
-rw-r--r--platform/macos/config.cmake2
-rw-r--r--platform/qt/config.cmake2
5 files changed, 5 insertions, 5 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake
index c27e6e0b93..3dd8e7f67d 100644
--- a/platform/android/config.cmake
+++ b/platform/android/config.cmake
@@ -20,7 +20,7 @@ mason_use(libzip VERSION 1.1.3)
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)
+mason_use(icu VERSION 58.1-min-size)
set(ANDROID_SDK_PROJECT_DIR ${CMAKE_SOURCE_DIR}/platform/android/MapboxGLAndroidSDK)
set(ANDROID_JNI_TARGET_DIR ${ANDROID_SDK_PROJECT_DIR}/src/main/jniLibs/${ANDROID_ABI})
diff --git a/platform/ios/config.cmake b/platform/ios/config.cmake
index 72e1c88525..cab8fd1357 100644
--- a/platform/ios/config.cmake
+++ b/platform/ios/config.cmake
@@ -1,6 +1,6 @@
add_definitions(-DMBGL_USE_GLES2=1)
-mason_use(icu VERSION 58.1)
+mason_use(icu VERSION 58.1-min-size)
macro(mbgl_platform_core)
set_xcode_property(mbgl-core IPHONEOS_DEPLOYMENT_TARGET "8.0")
diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake
index b2366540ae..ff2dcf4cfa 100644
--- a/platform/linux/config.cmake
+++ b/platform/linux/config.cmake
@@ -9,7 +9,7 @@ mason_use(libjpeg-turbo VERSION 1.5.0)
mason_use(webp VERSION 0.5.1)
mason_use(gtest VERSION 1.8.0${MASON_CXXABI_SUFFIX})
mason_use(benchmark VERSION 1.0.0-1)
-mason_use(icu VERSION 58.1)
+mason_use(icu VERSION 58.1-min-size)
include(cmake/loop-uv.cmake)
diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake
index 309d8e82f3..cbaf3d492e 100644
--- a/platform/macos/config.cmake
+++ b/platform/macos/config.cmake
@@ -4,7 +4,7 @@ mason_use(glfw VERSION 2017-02-09-77a8f10)
mason_use(boost_libprogram_options VERSION 1.62.0)
mason_use(gtest VERSION 1.8.0)
mason_use(benchmark VERSION 1.0.0-1)
-mason_use(icu VERSION 58.1)
+mason_use(icu VERSION 58.1-min-size)
include(cmake/loop-darwin.cmake)
diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake
index 4563f03a9b..0f2bab0516 100644
--- a/platform/qt/config.cmake
+++ b/platform/qt/config.cmake
@@ -10,7 +10,7 @@ if(NOT WITH_QT_DECODERS)
endif()
if(NOT WITH_QT_I18N)
- mason_use(icu VERSION 58.1)
+ mason_use(icu VERSION 58.1-min-size)
endif()
macro(mbgl_platform_core)