summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2018-07-22 19:15:18 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2018-07-22 19:15:18 +0300
commit3208a9d2dc1fb30e9e058b9775a02953dfe91837 (patch)
tree535ad47d16a2a612de1b85d56c6b167e54c13398
parent681e0141de63d0d5a545e87c40216163b2d63fc6 (diff)
downloadqtlocation-mapboxgl-upstream/benchmark-1.4.1.tar.gz
[build] Bump benchmark to v1.4.1upstream/benchmark-1.4.1
-rw-r--r--benchmark/fixtures/api/cache.dbbin1298432 -> 1298432 bytes
-rw-r--r--cmake/mason-dependencies.cmake4
2 files changed, 2 insertions, 2 deletions
diff --git a/benchmark/fixtures/api/cache.db b/benchmark/fixtures/api/cache.db
index 10452b2714..14f083b081 100644
--- a/benchmark/fixtures/api/cache.db
+++ b/benchmark/fixtures/api/cache.db
Binary files differ
diff --git a/cmake/mason-dependencies.cmake b/cmake/mason-dependencies.cmake
index 4553301a55..8483971008 100644
--- a/cmake/mason-dependencies.cmake
+++ b/cmake/mason-dependencies.cmake
@@ -31,7 +31,7 @@ elseif(MBGL_PLATFORM STREQUAL "linux")
mason_use(libpng VERSION 1.6.25)
mason_use(libjpeg-turbo VERSION 1.5.0)
mason_use(webp VERSION 0.5.1)
- mason_use(benchmark VERSION 1.2.0)
+ mason_use(benchmark VERSION 1.4.1${MASON_CXXABI_SUFFIX})
mason_use(icu VERSION 58.1-min-size)
mason_use(args VERSION 6.2.0 HEADER_ONLY)
@@ -40,7 +40,7 @@ elseif(MBGL_PLATFORM STREQUAL "linux")
endif()
elseif(MBGL_PLATFORM STREQUAL "macos")
mason_use(glfw VERSION 2018-06-27-0be4f3f)
- mason_use(benchmark VERSION 1.2.0)
+ mason_use(benchmark VERSION 1.4.1)
mason_use(icu VERSION 58.1-min-size)
mason_use(args VERSION 6.2.0 HEADER_ONLY)
elseif(MBGL_PLATFORM STREQUAL "qt")