diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-12-19 12:33:38 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-12-19 13:32:25 +0200 |
| commit | 7889b4dda943099db48bcb7850fe656a46b6c386 (patch) | |
| tree | 47ef786f33580c36571a17bb99c15ce420305c91 | |
| parent | f2d781ad55ab13a586cbf2b498d12364b50e4c38 (diff) | |
| download | qtlocation-mapboxgl-upstream/linux-clang-3.8-libcxx-typo.tar.gz | |
[build] Forgot to update CI image to linux-clang-3.8-libcxxupstream/linux-clang-3.8-libcxx-typo
| -rw-r--r-- | circle.yml | 2 | ||||
| -rw-r--r-- | platform/linux/config.cmake | 2 | ||||
| -rw-r--r-- | platform/macos/config.cmake | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/circle.yml b/circle.yml index 2d0b82676e..9ad07dc493 100644 --- a/circle.yml +++ b/circle.yml @@ -450,7 +450,7 @@ jobs: # ------------------------------------------------------------------------------ linux-clang-3.8-libcxx-debug: docker: - - image: mbgl/7d2403f42e:linux-clang-3.9 + - image: mbgl/7d2403f42e:linux-clang-3.8-libcxx working_directory: /src environment: LIBSYSCONFCPUS: 4 diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index 6de571e88b..05ca7a4e24 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -7,7 +7,7 @@ mason_use(libpng VERSION 1.6.25) 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.2.0) +mason_use(benchmark VERSION 1.3.0${MASON_CXXABI_SUFFIX}) mason_use(icu VERSION 58.1-min-size) mason_use(args VERSION 6.2.0 HEADER_ONLY) diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake index e929bb55c6..22c6b3305b 100644 --- a/platform/macos/config.cmake +++ b/platform/macos/config.cmake @@ -2,7 +2,7 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET 10.10) mason_use(glfw VERSION 2017-07-13-67c9155) mason_use(gtest VERSION 1.8.0) -mason_use(benchmark VERSION 1.2.0) +mason_use(benchmark VERSION 1.3.0) mason_use(icu VERSION 58.1-min-size) mason_use(args VERSION 6.2.0 HEADER_ONLY) |