From 5109d49f742fb4c46ab6016b4783f6b9e14e148f Mon Sep 17 00:00:00 2001 From: khizmax Date: Thu, 5 Mar 2015 14:11:20 +0300 Subject: [PATCH] Add C++11 support to travis-ci --- .travis.yml | 17 ++++++++++++++--- build/build.sh | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c19e6825..1e72fb3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,25 @@ language: cpp -compiler: clang +compiler: g++ # - gcc # - clang -#before_install: -#install: + +before_install: + - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test + - sudo apt-get update -qq + +install: + - sudo apt-get install -qq g++-4.8 + - export CXX="g++-4.8" + before_script: cd ./build + script: ./build.sh -b 64 -j 4 -x ${CXX} -z '-std=c++0x -Wall -Wextra -pedantic' -t test_hdr + #after_success: + #after_failure: + after_script: cd .. # blacklist diff --git a/build/build.sh b/build/build.sh index 7e79549d..621ffd5e 100755 --- a/build/build.sh +++ b/build/build.sh @@ -453,7 +453,7 @@ cxx_debug_options="-D_DEBUG -O0 -g $cxx_debug_options" cxx_release_options="-DNDEBUG $cxx_release_optimization $cxx_release_options" -if test $BOOST_INCLUDE_PATH != ''; then +if test '$BOOST_INCLUDE_PATH' != ''; then buildCXXflags="$buildCXXflags -I$BOOST_INCLUDE_PATH" fi -- 2.34.1