diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2017-02-23 17:47:51 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-02-23 18:39:40 +0200 |
| commit | d2469f4bdb7b0351e3c65332dce617e71d33620e (patch) | |
| tree | 8b5f810e5c235a3169379544b9e512119af2350e | |
| parent | 3ba3f314169ec588cd3a87868b252560c1ce07c2 (diff) | |
| download | qtlocation-mapboxgl-d2469f4bdb7b0351e3c65332dce617e71d33620e.tar.gz | |
[build] Fix build on Ubuntu 16.04+
gtest was broken because of lack of CXX11ABI support.
| -rw-r--r-- | platform/linux/config.cmake | 2 | ||||
| -rw-r--r-- | platform/qt/config.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index 5f2f41547a..b2366540ae 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -7,7 +7,7 @@ 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.8.0) +mason_use(gtest VERSION 1.8.0${MASON_CXXABI_SUFFIX}) mason_use(benchmark VERSION 1.0.0-1) mason_use(icu VERSION 58.1) diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake index fe5c45b479..e97c6b340a 100644 --- a/platform/qt/config.cmake +++ b/platform/qt/config.cmake @@ -1,7 +1,7 @@ include(platform/qt/qt.cmake) mason_use(sqlite VERSION 3.14.2) -mason_use(gtest VERSION 1.8.0) +mason_use(gtest VERSION 1.8.0${MASON_CXXABI_SUFFIX}) if(NOT WITH_QT_DECODERS) mason_use(libjpeg-turbo VERSION 1.5.0) |