diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-09-19 12:32:17 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-09-19 14:38:47 +0200 |
| commit | 1014a503a22dc47e4e6ec3c37d034fd729873345 (patch) | |
| tree | 6682ac3f03f2ea77ed720a03cc4ea7eecbeddd4e /platform | |
| parent | d169ea55c1cfa85cd8bf19f94c5f023569f71810 (diff) | |
| download | qtlocation-mapboxgl-1014a503a22dc47e4e6ec3c37d034fd729873345.tar.gz | |
[build] Upgrade GLFW to 3.2.1, SQLite to 3.14.2 and libwebp to 0.5.1
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/config.cmake | 2 | ||||
| -rw-r--r-- | platform/linux/config.cmake | 6 | ||||
| -rw-r--r-- | platform/macos/config.cmake | 3 | ||||
| -rw-r--r-- | platform/qt/bitrise-qt5.yml | 1 | ||||
| -rw-r--r-- | platform/qt/config.cmake | 4 |
5 files changed, 9 insertions, 7 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake index a213a048a9..b8e83da239 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -6,7 +6,7 @@ mason_use(libjpeg-turbo VERSION 1.4.2) mason_use(libpng VERSION 1.6.20) mason_use(libzip VERSION 0.11.2) mason_use(nunicode VERSION 1.6) -mason_use(sqlite VERSION 3.9.1) +mason_use(sqlite VERSION 3.14.2) macro(mbgl_platform_core) diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index 038719d66f..6ff665afaf 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -1,11 +1,11 @@ -mason_use(glfw VERSION 3.1.2) +mason_use(glfw VERSION 3.2.1) mason_use(boost_libprogram_options VERSION 1.60.0) -mason_use(sqlite VERSION 3.9.1) +mason_use(sqlite VERSION 3.14.2) mason_use(libuv VERSION 1.7.5) mason_use(nunicode VERSION 1.6) mason_use(libpng VERSION 1.6.20) mason_use(libjpeg-turbo VERSION 1.4.2) -mason_use(webp VERSION 0.5.0) +mason_use(webp VERSION 0.5.1) mason_use(gtest VERSION 1.7.0${MASON_CXXABI_SUFFIX}) include(cmake/loop-uv.cmake) diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake index f38ca52c5e..84d5051902 100644 --- a/platform/macos/config.cmake +++ b/platform/macos/config.cmake @@ -1,6 +1,6 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET 10.10) -mason_use(glfw VERSION 3.1.2) +mason_use(glfw VERSION 3.2.1) mason_use(boost_libprogram_options VERSION 1.60.0) mason_use(gtest VERSION 1.7.0${MASON_CXXABI_SUFFIX}) @@ -57,6 +57,7 @@ endmacro() macro(mbgl_platform_glfw) target_link_libraries(mbgl-glfw PRIVATE mbgl-loop + PRIVATE "-framework OpenGL" PRIVATE "-lsqlite3" ) endmacro() diff --git a/platform/qt/bitrise-qt5.yml b/platform/qt/bitrise-qt5.yml index a28ef7a01f..4122012327 100644 --- a/platform/qt/bitrise-qt5.yml +++ b/platform/qt/bitrise-qt5.yml @@ -29,6 +29,7 @@ workflows: - content: |- #!/bin/bash set -eu -o pipefail + sudo chown -R $USER /usr/local brew install cmake brew install qt5 brew link qt5 --force diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake index 0cc07cc8ae..41c5a2a248 100644 --- a/platform/qt/config.cmake +++ b/platform/qt/config.cmake @@ -1,12 +1,12 @@ include(platform/qt/qt.cmake) -mason_use(sqlite VERSION 3.9.1) +mason_use(sqlite VERSION 3.14.2) mason_use(gtest VERSION 1.7.0${MASON_CXXABI_SUFFIX}) if(NOT WITH_QT_DECODERS) mason_use(libjpeg-turbo VERSION 1.4.2) mason_use(libpng VERSION 1.6.20) - mason_use(webp VERSION 0.5.0) + mason_use(webp VERSION 0.5.1) endif() macro(mbgl_platform_core) |