openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fix travis for Linux build

Browse Source 
Several issues was detected with linux build:
- travis_wait raise timeout
- --jobs=2 sometimes fails
- add flag BOOST_NO_CXX11_SCOPED_ENUMS to fix compilation with old boost filesystme
- add missing tool xmllint
This commit is contained in:
Michael Bonfils
2018-03-06 20:37:58 +01:00
committed by Celtic Minstrel
parent d1838991a8
commit 69589afff7
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis-install-deps.sh
View File

@@ -7,5 +7,5 @@ if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
brew install scons sfml brew install scons sfml
else else
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -qq libsfml-dev libboost-dev libboost-filesystem-dev libboost-thread-dev sudo apt-get install -qq libsfml-dev libboost-dev libboost-filesystem-dev libboost-thread-dev libxml2-utils
fi fi

2
.travis.yml
View File

@@ -3,7 +3,7 @@ language: cpp
sudo: required sudo: required
services: ['docker'] services: ['docker']
script: travis_wait scons --jobs=2 script: CXXFLAGS=-DBOOST_NO_CXX11_SCOPED_ENUMS scons
compiler: compiler:
- clang - clang

3
SConstruct
View File

@@ -25,6 +25,9 @@ else:
env.VariantDir('#build/obj', 'src') env.VariantDir('#build/obj', 'src')
env.VariantDir('#build/obj/test', 'test') env.VariantDir('#build/obj/test', 'test')
# Allow arbitrary flags
env.Append(CXXFLAGS=os.environ.get('CXXFLAGS', ''))
debug = ARGUMENTS.get('debug', 0) debug = ARGUMENTS.get('debug', 0)
if int(debug): if int(debug):
env.Append(CCFLAGS = '-g') env.Append(CCFLAGS = '-g')