diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2017-02-08 13:26:23 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2017-02-08 19:07:16 +0100 |
| commit | bb931505c5f11c21a31cdd7be6fe036ca44e729d (patch) | |
| tree | e0310f3a4965dbe364639efb610d96eeca49ee19 /platform/linux | |
| parent | f5b86c0f11bc921647d1f677b62a14527bfb50c3 (diff) | |
| download | qtlocation-mapboxgl-bb931505c5f11c21a31cdd7be6fe036ca44e729d.tar.gz | |
[build] Remove Mason submodule in favor of CMake mason
Diffstat (limited to 'platform/linux')
| -rw-r--r-- | platform/linux/config.cmake | 6 | ||||
| -rwxr-xr-x | platform/linux/scripts/coveralls.sh | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index ac1a195822..7f32622596 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -1,5 +1,5 @@ mason_use(glfw VERSION 3.2.1) -mason_use(mesa VERSION 13.0.3) +mason_use(mesa VERSION 13.0.4) mason_use(boost_libprogram_options VERSION 1.62.0${MASON_CXXABI_SUFFIX}) mason_use(sqlite VERSION 3.14.2) mason_use(libuv VERSION 1.9.1) @@ -7,8 +7,8 @@ mason_use(nunicode VERSION 1.7.1) 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.7.0${MASON_CXXABI_SUFFIX}) -mason_use(benchmark VERSION 1.0.0) +mason_use(gtest VERSION 1.8.0) +mason_use(benchmark VERSION 1.0.0-1) mason_use(icu VERSION 58.1) include(cmake/loop-uv.cmake) diff --git a/platform/linux/scripts/coveralls.sh b/platform/linux/scripts/coveralls.sh index 8d5903de6c..b8ab73a24e 100755 --- a/platform/linux/scripts/coveralls.sh +++ b/platform/linux/scripts/coveralls.sh @@ -3,12 +3,9 @@ set -e set -o pipefail -mapbox_time "install_lcov" \ -mason install lcov 1.12 - # Collect coverage data and save it into coverage.info mapbox_time "lcov_capture" \ -`mason prefix lcov 1.12`/usr/bin/lcov \ +`scripts/mason.sh PREFIX lcov VERSION 1.12`/usr/bin/lcov \ --quiet \ --capture \ --no-external \ |