diff options
| author | Milo Yip <miloyip@gmail.com> | 2016-02-24 18:32:56 +0300 |
|---|---|---|
| committer | Milo Yip <miloyip@gmail.com> | 2016-02-24 18:32:56 +0300 |
| commit | 5a955c0d14c4a5d7bf4687c5b01f6bf6a200c041 (patch) | |
| tree | 2f2e8888f23aacb2f826b6dc7a2651e0bab74c07 /.travis.yml | |
| parent | ae840f66c5a32cfc2f9bc740a08a99c71237a565 (diff) | |
Add C++11 config
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 37 |
1 files changed, 30 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 7b74ba01..10b0babf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,8 @@ global: matrix: include: - - env: CONF=release ARCH=x86 + # gcc + - env: CONF=release ARCH=x86 CXX11=ON compiler: gcc addons: apt: @@ -30,9 +31,30 @@ matrix: - *default_packages - g++-multilib - libc6-dbg:i386 - - env: CONF=release ARCH=x86_64 + - env: CONF=release ARCH=x86_64 CXX11=ON 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 addons: apt: @@ -40,9 +62,9 @@ matrix: - *default_packages - g++-multilib - 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 - - env: CONF=release ARCH=x86 CCACHE_CPP2=yes + - env: CONF=release ARCH=x86 CXX11=ON CCACHE_CPP2=yes compiler: clang addons: apt: @@ -50,10 +72,10 @@ matrix: - *default_packages - g++-multilib - 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 # coverage report - - env: CONF=debug ARCH=x86 GCOV_FLAGS='--coverage' + - env: CONF=debug ARCH=x86 CXX11=ON GCOV_FLAGS='--coverage' compiler: gcc cache: - ccache @@ -104,6 +126,7 @@ script: eval "ARCH_FLAGS=\${ARCH_FLAGS_${ARCH}}" ; (cd build && cmake -DRAPIDJSON_HAS_STDSTRING=ON + -DRAPIDJSON_BUILD_CXX11=$CXX11 -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=$CONF -DCMAKE_CXX_FLAGS="$ARCH_FLAGS $GCOV_FLAGS" |