Skip to content

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

Add travis C++11 on/off matrix

parent a7490404
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
.travis.yml
View file @ 40311501
...@@ -6,10 +6,12 @@ compiler: ...@@ -6,10 +6,12 @@ compiler:
env: env:
matrix: matrix:
- CONF=debug ARCH=x86_64 - CONF=debug ARCH=x86_64 CXX11=ON
- CONF=release ARCH=x86_64 - CONF=release ARCH=x86_64 CXX11=ON
- CONF=debug ARCH=x86 - CONF=debug ARCH=x86 CXX11=ON
- CONF=release ARCH=x86 - CONF=release ARCH=x86 CXX11=ON
- CONF=debug ARCH=x86_64 CXX11=OFF
- CONF=debug ARCH=x86 CXX11=OFF
global: global:
- ARCH_FLAGS_x86='-m32' # #266: don't use SSE on 32-bit - ARCH_FLAGS_x86='-m32' # #266: don't use SSE on 32-bit
- ARCH_FLAGS_x86_64='-msse4.2' # use SSE4.2 on 64-bit - ARCH_FLAGS_x86_64='-msse4.2' # use SSE4.2 on 64-bit
...@@ -34,6 +36,7 @@ before_script: ...@@ -34,6 +36,7 @@ before_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