diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-11-07 10:54:38 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-11-08 18:02:38 +0200 |
| commit | 8e99ae44dd5bf72bc8bd844251e9d670095804ac (patch) | |
| tree | 38ddbf84fea7c9385de25f981d298fec9a99166a /Makefile | |
| parent | d0ac12309b470eb59690ece3f15773df73a127e1 (diff) | |
| download | qtlocation-mapboxgl-8e99ae44dd5bf72bc8bd844251e9d670095804ac.tar.gz | |
[build] Use mesa-13.0.0-glx in CI builds
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -292,6 +292,7 @@ $(LINUX_BUILD): $(BUILD_DEPS) -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ -DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh) \ -DWITH_COVERAGE=${WITH_COVERAGE} \ + -DIS_CI_BUILD=${CI} \ -DWITH_OSMESA=${WITH_OSMESA}) .PHONY: linux @@ -387,7 +388,8 @@ $(QT_BUILD): $(BUILD_DEPS) -DWITH_QT_DECODERS=${WITH_QT_DECODERS} \ -DWITH_QT_4=${WITH_QT_4} \ -DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh) \ - -DWITH_COVERAGE=${WITH_COVERAGE}) + -DWITH_COVERAGE=${WITH_COVERAGE} \ + -DIS_CI_BUILD=${CI}) ifeq ($(HOST_PLATFORM), macos) @@ -401,7 +403,8 @@ $(MACOS_QT_PROJ_PATH): $(BUILD_DEPS) -DWITH_QT_DECODERS=${WITH_QT_DECODERS} \ -DWITH_QT_4=${WITH_QT_4} \ -DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh) \ - -DWITH_COVERAGE=${WITH_COVERAGE}) + -DWITH_COVERAGE=${WITH_COVERAGE} \ + -DIS_CI_BUILD=${CI}) @# Create Xcode schemes so that we can use xcodebuild from the command line. CMake doesn't @# create these automatically. |