oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-21 18:11:11 +00:00
Code Wiki Activity

Travis: build matrix improvements + CPP11 build

Browse source
This commit is contained in:
Loic Blot 2016-10-05 22:17:22 +02:00 • committed by Ner'zhul
parent 7fab86a49d
commit 61d1751dff
5 changed files with 30 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

10
util/travis/before_install.sh
View file

@ -1,16 +1,8 @@
#!/bin/bash -e
if [[ $TRAVIS_OS_NAME == "linux" ]]; then
if [[ $CC == "clang" ]]; then
export PATH="/usr/bin/:$PATH"
sudo sh -c 'echo "deb http://ppa.launchpad.net/eudoxos/llvm-3.1/ubuntu precise main" >> /etc/apt/sources.list'
sudo apt-key adv --keyserver pool.sks-keyservers.net --recv-keys 92DE8183
sudo apt-get update
sudo apt-get install llvm-3.1
sudo apt-get install clang
fi
sudo apt-get update
sudo apt-get install p7zip-full
sudo apt-get install p7zip-full $COMPILER
fi
if [[ $PLATFORM == "Unix" ]]; then

4
util/travis/script.sh
View file

@ -4,6 +4,10 @@ if [[ $PLATFORM == "Unix" ]]; then
mkdir -p travisbuild
cd travisbuild || exit 1
CMAKE_FLAGS=''
if [[ $COMPILER == "g++-6" ]]; then
export CC=gcc-6
export CXX=g++-6
fi
# Clang builds with FreeType fail on Travis
if [[ $CC == "clang" ]]; then
CMAKE_FLAGS+=' -DENABLE_FREETYPE=FALSE'