From f9616835162906efc80d51f9b534f790e445941b Mon Sep 17 00:00:00 2001 From: Mario Werner Date: Sun, 7 Feb 2016 18:41:46 +0100 Subject: [PATCH] specify c++11 as c++0x for travis --- .travis.yml | 4 ++-- support/travis-build.py | 28 +++++++++++----------------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0af0f167..9a97e51b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,10 +13,10 @@ env: 6pxmyzLHSn1ZR7OX5rfPvwM3tOyZ3H0= matrix: - BUILD=Doc - - BUILD=Debug STANDARD=11 + - BUILD=Debug STANDARD=0x - BUILD=Release STANDARD=98 - BUILD=Release STANDARD=03 - - BUILD=Release STANDARD=11 + - BUILD=Release STANDARD=0x matrix: exclude: diff --git a/support/travis-build.py b/support/travis-build.py index 1997f99d..8888198b 100755 --- a/support/travis-build.py +++ b/support/travis-build.py @@ -85,29 +85,23 @@ buildDir_test = os.path.join(srcDir,"_build_test") # configure library makedirs_if_not_exist(buildDir) os.chdir(buildDir) -if cppStandard == '98': - check_call(['cmake', '-DCMAKE_INSTALL_PREFIX='+installDir, - '-DCMAKE_BUILD_TYPE=' + build, - '-DCMAKE_CXX_FLAGS=-std=c++98', - '-DFMT_USE_CPP11=OFF', - '-DFMT_DOC=OFF', - '-DFMT_PEDANTIC=ON', - srcDir]) -if cppStandard == '03': - check_call(['cmake', '-DCMAKE_INSTALL_PREFIX='+installDir, - '-DCMAKE_BUILD_TYPE=' + build, - '-DCMAKE_CXX_FLAGS=-std=c++03', - '-DFMT_USE_CPP11=OFF', - '-DFMT_DOC=OFF', - '-DFMT_PEDANTIC=ON', - srcDir]) -else: +if cppStandard == '0x': # default configuration check_call(['cmake', '-DCMAKE_INSTALL_PREFIX='+installDir, '-DCMAKE_BUILD_TYPE=' + build, '-DFMT_DOC=OFF', '-DFMT_PEDANTIC=ON', srcDir]) +else: + check_call(['cmake', '-DCMAKE_INSTALL_PREFIX='+installDir, + '-DCMAKE_BUILD_TYPE=' + build, + '-DCMAKE_CXX_FLAGS=-std=c++' + cppStandard, + '-DFMT_USE_CPP11=OFF', + '-DFMT_DOC=OFF', + '-DFMT_PEDANTIC=ON', + srcDir]) +else: + # build library check_call(['make', '-j4'])