diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-07-18 18:33:33 +0300 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-08-05 11:42:22 +0200 |
| commit | 6b44aa9095316c7823880f25a745490e271c3400 (patch) | |
| tree | 0f69153ba5b2a65dbac11c83e7108a6d1cf50730 | |
| parent | e82aeddb6f00d82a02e73aaa17190f9ba9a3b38f (diff) | |
| download | qtlocation-mapboxgl-6b44aa9095316c7823880f25a745490e271c3400.tar.gz | |
[build] Use cxx11abi suffix when needed
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rwxr-xr-x | scripts/check-cxx11abi.sh | 6 |
3 files changed, 17 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e81bfe2e57..04b2b6c051 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,15 +9,23 @@ mason_use(variant 1.1.0) mason_use(unique_resource dev) mason_use(rapidjson 1.0.2) mason_use(boost 1.60.0) -mason_use(geojson 0.1.4) mason_use(geojsonvt 6.1.2) mason_use(supercluster 0.2.0) mason_use(kdbush 0.1.1) mason_use(earcut 0.11) mason_use(protozero 1.3.0) -mason_use(gtest 1.7.0) mason_use(pixelmatch 0.9.0) +option(WITH_CXX11ABI "Use cxx11abi mason packages" OFF) + +if(WITH_CXX11ABI) + mason_use(geojson 0.1.4-cxx11abi) + mason_use(gtest 1.7.0-cxx11abi) +else() + mason_use(geojson 0.1.4) + mason_use(gtest 1.7.0) +endif() + set(CMAKE_CONFIGURATION_TYPES Debug Release) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -Wextra -Wshadow -Wno-variadic-macros -Wno-unknown-pragmas") @@ -257,7 +257,8 @@ $(LINUX_BUILD): $(BUILD_DEPS) mkdir -p $(LINUX_OUTPUT_PATH) (cd $(LINUX_OUTPUT_PATH) && cmake -G Ninja ../../.. \ -DCMAKE_BUILD_TYPE=$(BUILDTYPE) \ - -DCMAKE_EXPORT_COMPILE_COMMANDS=ON) + -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ + -DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh)) .PHONY: linux linux: glfw-app render offline @@ -337,7 +338,8 @@ $(QT_BUILD): $(BUILD_DEPS) -DBUILD_PLATFORM=$(BUILD_PLATFORM) \ -DMBGL_PLATFORM=qt \ -DWITH_QT_DECODERS=${WITH_QT_DECODERS} \ - -DWITH_QT_4=${WITH_QT_4}) + -DWITH_QT_4=${WITH_QT_4} \ + -DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh)) .PHONY: qt-app qt-app: $(QT_BUILD) diff --git a/scripts/check-cxx11abi.sh b/scripts/check-cxx11abi.sh index 512919371d..c543e52cb6 100755 --- a/scripts/check-cxx11abi.sh +++ b/scripts/check-cxx11abi.sh @@ -4,7 +4,7 @@ set -e set -o pipefail if [ ! `uname -s` = 'Linux' ]; then - echo "" + echo -n "OFF" exit 0 fi @@ -13,7 +13,7 @@ fi LIBSTDCPP=$(ldd $(dirname $0)/check-cxx11abi.dat |grep libstdc++ |cut -d' ' -f3) if [ $(readelf -Ws $LIBSTDCPP |c++filt |grep -c ::__cxx11::) -gt 0 ]; then - echo "-cxx11abi" + echo -n "ON" else - echo "" + echo -n "OFF" fi |