From 8e99ae44dd5bf72bc8bd844251e9d670095804ac Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Mon, 7 Nov 2016 10:54:38 +0200 Subject: [build] Use mesa-13.0.0-glx in CI builds --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 29acc367f4..5effbe819b 100644 --- a/Makefile +++ b/Makefile @@ -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. -- cgit v1.2.1