summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2018-08-09 12:15:09 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2018-08-10 08:49:18 -0700
commitb500577bfa9759241b374c161a06c1bef79cf4cd (patch)
tree170d96d3a9530b16a01b0d9457870cb79787bb14 /cmake
parent070f50d6b032942591fcc392fc4bdd72bddc31c4 (diff)
downloadqtlocation-mapboxgl-b500577bfa9759241b374c161a06c1bef79cf4cd.tar.gz
[android, linux] Upgrade to SQLite 3.24.0, compiled to minimize binary size
Diffstat (limited to 'cmake')
-rw-r--r--cmake/mason-dependencies.cmake4
-rw-r--r--cmake/mason.cmake4
2 files changed, 4 insertions, 4 deletions
diff --git a/cmake/mason-dependencies.cmake b/cmake/mason-dependencies.cmake
index cffce0a440..826dcf2e45 100644
--- a/cmake/mason-dependencies.cmake
+++ b/cmake/mason-dependencies.cmake
@@ -20,13 +20,13 @@ mason_use(vector-tile VERSION 1.0.2 HEADER_ONLY)
if(MBGL_PLATFORM STREQUAL "android")
mason_use(jni.hpp VERSION 3.0.0 HEADER_ONLY)
- mason_use(sqlite VERSION 3.14.2)
+ mason_use(sqlite VERSION 3.24.0-min-size)
mason_use(icu VERSION 58.1-min-size)
elseif(MBGL_PLATFORM STREQUAL "ios")
mason_use(icu VERSION 58.1-min-size)
elseif(MBGL_PLATFORM STREQUAL "linux")
mason_use(glfw VERSION 2018-06-27-0be4f3f)
- mason_use(sqlite VERSION 3.14.2)
+ mason_use(sqlite VERSION 3.24.0-min-size)
mason_use(libuv VERSION 1.9.1)
mason_use(libpng VERSION 1.6.25)
mason_use(libjpeg-turbo VERSION 1.5.0)
diff --git a/cmake/mason.cmake b/cmake/mason.cmake
index 6116067080..00d268421a 100644
--- a/cmake/mason.cmake
+++ b/cmake/mason.cmake
@@ -24,11 +24,11 @@ function(mason_detect_platform)
# Android Studio only passes ANDROID_ABI, but we need to adjust that to the Mason
if(MASON_PLATFORM STREQUAL "android" AND NOT MASON_PLATFORM_VERSION)
if (ANDROID_ABI STREQUAL "armeabi-v7a")
- set(MASON_PLATFORM_VERSION "arm-v7-9" PARENT_SCOPE)
+ set(MASON_PLATFORM_VERSION "arm-v7-14" PARENT_SCOPE)
elseif (ANDROID_ABI STREQUAL "arm64-v8a")
set(MASON_PLATFORM_VERSION "arm-v8-21" PARENT_SCOPE)
elseif (ANDROID_ABI STREQUAL "x86")
- set(MASON_PLATFORM_VERSION "x86-9" PARENT_SCOPE)
+ set(MASON_PLATFORM_VERSION "x86-14" PARENT_SCOPE)
elseif (ANDROID_ABI STREQUAL "x86_64")
set(MASON_PLATFORM_VERSION "x86-64-21" PARENT_SCOPE)
else()