Skip to content

R
rapidjson
Commit 5a955c0d authored by Milo Yip's avatar Milo Yip
Browse files
Options

Add C++11 config

parent ae840f66
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 7 deletions
.travis.yml
View file @ 5a955c0d
...@@ -22,7 +22,8 @@ global: ...@@ -22,7 +22,8 @@ global:
matrix: matrix:
include: include:
- env: CONF=release ARCH=x86 # gcc
- env: CONF=release ARCH=x86 CXX11=ON
compiler: gcc compiler: gcc
addons: addons:
apt: apt:
...@@ -30,9 +31,30 @@ matrix: ...@@ -30,9 +31,30 @@ matrix:
- *default_packages - *default_packages
- g++-multilib - g++-multilib
- libc6-dbg:i386 - libc6-dbg:i386
- env: CONF=release ARCH=x86_64 - env: CONF=release ARCH=x86_64 CXX11=ON
compiler: gcc compiler: gcc
- env: CONF=debug ARCH=x86 CCACHE_CPP2=yes - env: CONF=debug ARCH=x86 CXX11=OFF
compiler: gcc
addons:
apt:
packages:
- *default_packages
- g++-multilib
- libc6-dbg:i386
- env: CONF=debug ARCH=x86_64 CXX11=OFF
compiler: gcc
# clang
- env: CONF=debug ARCH=x86 CXX11=ON CCACHE_CPP2=yes
compiler: clang
addons:
apt:
packages:
- *default_packages
- g++-multilib
- libc6-dbg:i386
- env: CONF=debug ARCH=x86_64 CXX11=ON CCACHE_CPP2=yes
compiler: clang
- env: CONF=debug ARCH=x86 CXX11=OFF CCACHE_CPP2=yes
compiler: clang compiler: clang
addons: addons:
apt: apt:
...@@ -40,9 +62,9 @@ matrix: ...@@ -40,9 +62,9 @@ matrix:
- *default_packages - *default_packages
- g++-multilib - g++-multilib
- libc6-dbg:i386 - libc6-dbg:i386
- env: CONF=debug ARCH=x86_64 CCACHE_CPP2=yes - env: CONF=debug ARCH=x86_64 CXX11=OFF CCACHE_CPP2=yes
compiler: clang compiler: clang
- env: CONF=release ARCH=x86 CCACHE_CPP2=yes - env: CONF=release ARCH=x86 CXX11=ON CCACHE_CPP2=yes
compiler: clang compiler: clang
addons: addons:
apt: apt:
...@@ -50,10 +72,10 @@ matrix: ...@@ -50,10 +72,10 @@ matrix:
- *default_packages - *default_packages
- g++-multilib - g++-multilib
- libc6-dbg:i386 - libc6-dbg:i386
- env: CONF=release ARCH=x86_64 CCACHE_CPP2=yes - env: CONF=release ARCH=x86_64 CXX11=ON CCACHE_CPP2=yes
compiler: clang compiler: clang
# coverage report # coverage report
- env: CONF=debug ARCH=x86 GCOV_FLAGS='--coverage' - env: CONF=debug ARCH=x86 CXX11=ON GCOV_FLAGS='--coverage'
compiler: gcc compiler: gcc
cache: cache:
- ccache - ccache
...@@ -104,6 +126,7 @@ script: ...@@ -104,6 +126,7 @@ script:
eval "ARCH_FLAGS=\${ARCH_FLAGS_${ARCH}}" ; eval "ARCH_FLAGS=\${ARCH_FLAGS_${ARCH}}" ;
(cd build && cmake (cd build && cmake
-DRAPIDJSON_HAS_STDSTRING=ON -DRAPIDJSON_HAS_STDSTRING=ON
-DRAPIDJSON_BUILD_CXX11=$CXX11
-DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_VERBOSE_MAKEFILE=ON
-DCMAKE_BUILD_TYPE=$CONF -DCMAKE_BUILD_TYPE=$CONF
-DCMAKE_CXX_FLAGS="$ARCH_FLAGS $GCOV_FLAGS" -DCMAKE_CXX_FLAGS="$ARCH_FLAGS $GCOV_FLAGS"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment