specify c++11 as c++0x for travis

This commit is contained in:
Mario Werner 2016-02-07 18:41:46 +01:00
parent 27a1b787c8
commit f961683516
2 changed files with 13 additions and 19 deletions

View File

@ -13,10 +13,10 @@ env:
6pxmyzLHSn1ZR7OX5rfPvwM3tOyZ3H0= 6pxmyzLHSn1ZR7OX5rfPvwM3tOyZ3H0=
matrix: matrix:
- BUILD=Doc - BUILD=Doc
- BUILD=Debug STANDARD=11 - BUILD=Debug STANDARD=0x
- BUILD=Release STANDARD=98 - BUILD=Release STANDARD=98
- BUILD=Release STANDARD=03 - BUILD=Release STANDARD=03
- BUILD=Release STANDARD=11 - BUILD=Release STANDARD=0x
matrix: matrix:
exclude: exclude:

View File

@ -85,29 +85,23 @@ buildDir_test = os.path.join(srcDir,"_build_test")
# configure library # configure library
makedirs_if_not_exist(buildDir) makedirs_if_not_exist(buildDir)
os.chdir(buildDir) os.chdir(buildDir)
if cppStandard == '98': if cppStandard == '0x':
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:
# default configuration # default configuration
check_call(['cmake', '-DCMAKE_INSTALL_PREFIX='+installDir, check_call(['cmake', '-DCMAKE_INSTALL_PREFIX='+installDir,
'-DCMAKE_BUILD_TYPE=' + build, '-DCMAKE_BUILD_TYPE=' + build,
'-DFMT_DOC=OFF', '-DFMT_DOC=OFF',
'-DFMT_PEDANTIC=ON', '-DFMT_PEDANTIC=ON',
srcDir]) 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 # build library
check_call(['make', '-j4']) check_call(['make', '-j4'])