From d2469f4bdb7b0351e3c65332dce617e71d33620e Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Thu, 23 Feb 2017 17:47:51 +0200 Subject: [PATCH] [build] Fix build on Ubuntu 16.04+ gtest was broken because of lack of CXX11ABI support. --- platform/linux/config.cmake | 2 +- 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 5f2f41547..b2366540a 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 fe5c45b47..e97c6b340 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)