Skip to content

Commit 5a955c0

Browse files
committed
Add C++11 config
1 parent ae840f6 commit 5a955c0

File tree

1 file changed

+30
-7
lines changed

1 file changed

+30
-7
lines changed

.travis.yml

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,38 +22,60 @@ global:
2222

2323
matrix:
2424
include:
25-
- env: CONF=release ARCH=x86
25+
# gcc
26+
- env: CONF=release ARCH=x86 CXX11=ON
2627
compiler: gcc
2728
addons:
2829
apt:
2930
packages:
3031
- *default_packages
3132
- g++-multilib
3233
- libc6-dbg:i386
33-
- env: CONF=release ARCH=x86_64
34+
- env: CONF=release ARCH=x86_64 CXX11=ON
3435
compiler: gcc
35-
- env: CONF=debug ARCH=x86 CCACHE_CPP2=yes
36+
- env: CONF=debug ARCH=x86 CXX11=OFF
37+
compiler: gcc
38+
addons:
39+
apt:
40+
packages:
41+
- *default_packages
42+
- g++-multilib
43+
- libc6-dbg:i386
44+
- env: CONF=debug ARCH=x86_64 CXX11=OFF
45+
compiler: gcc
46+
# clang
47+
- env: CONF=debug ARCH=x86 CXX11=ON CCACHE_CPP2=yes
48+
compiler: clang
49+
addons:
50+
apt:
51+
packages:
52+
- *default_packages
53+
- g++-multilib
54+
- libc6-dbg:i386
55+
- env: CONF=debug ARCH=x86_64 CXX11=ON CCACHE_CPP2=yes
56+
compiler: clang
57+
- env: CONF=debug ARCH=x86 CXX11=OFF CCACHE_CPP2=yes
3658
compiler: clang
3759
addons:
3860
apt:
3961
packages:
4062
- *default_packages
4163
- g++-multilib
4264
- libc6-dbg:i386
43-
- env: CONF=debug ARCH=x86_64 CCACHE_CPP2=yes
65+
- env: CONF=debug ARCH=x86_64 CXX11=OFF CCACHE_CPP2=yes
4466
compiler: clang
45-
- env: CONF=release ARCH=x86 CCACHE_CPP2=yes
67+
- env: CONF=release ARCH=x86 CXX11=ON CCACHE_CPP2=yes
4668
compiler: clang
4769
addons:
4870
apt:
4971
packages:
5072
- *default_packages
5173
- g++-multilib
5274
- libc6-dbg:i386
53-
- env: CONF=release ARCH=x86_64 CCACHE_CPP2=yes
75+
- env: CONF=release ARCH=x86_64 CXX11=ON CCACHE_CPP2=yes
5476
compiler: clang
5577
# coverage report
56-
- env: CONF=debug ARCH=x86 GCOV_FLAGS='--coverage'
78+
- env: CONF=debug ARCH=x86 CXX11=ON GCOV_FLAGS='--coverage'
5779
compiler: gcc
5880
cache:
5981
- ccache
@@ -104,6 +126,7 @@ script:
104126
eval "ARCH_FLAGS=\${ARCH_FLAGS_${ARCH}}" ;
105127
(cd build && cmake
106128
-DRAPIDJSON_HAS_STDSTRING=ON
129+
-DRAPIDJSON_BUILD_CXX11=$CXX11
107130
-DCMAKE_VERBOSE_MAKEFILE=ON
108131
-DCMAKE_BUILD_TYPE=$CONF
109132
-DCMAKE_CXX_FLAGS="$ARCH_FLAGS $GCOV_FLAGS"

0 commit comments

Comments
 (0)