travis: add cmake to build matrix

Add Nathan's PPA for cmake 3.2.3 (3.0 or newer is required).
This commit is contained in:
Peter Wu 2016-03-12 23:39:43 +01:00
parent 7c55c335cc
commit 4d801cd696
1 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,7 @@
env:
matrix:
- CI_BUILD=cmake
- CI_BUILD=autotools
language: cpp language: cpp
compiler: compiler:
- clang - clang
@ -7,6 +11,7 @@ addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- george-edison55-precise-backports
packages: packages:
- g++-4.9 - g++-4.9
- libstdc++-4.9-dev - libstdc++-4.9-dev
@ -23,11 +28,14 @@ addons:
- libevent-dev - libevent-dev
- libjansson-dev - libjansson-dev
- libjemalloc-dev - libjemalloc-dev
- cmake
- cmake-data
before_install: before_install:
- $CC --version - $CC --version
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi - if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
- $CC --version - $CC --version
- go version - go version
- cmake --version
before_script: before_script:
# First build spdylay, since integration tests require it. # First build spdylay, since integration tests require it.
# spdylay is going to be built under third-party/spdylay # spdylay is going to be built under third-party/spdylay
@ -40,9 +48,10 @@ before_script:
- export SPDYLAY_HOME=$PWD - export SPDYLAY_HOME=$PWD
- cd ../.. - cd ../..
# Now build nghttp2 # Now build nghttp2
- autoreconf -i - if [ "$CI_BUILD" = "autotools" ]; then autoreconf -i; fi
- git submodule update --init - git submodule update --init
- ./configure --enable-werror --with-mruby --with-neverbleed LIBSPDYLAY_CFLAGS="-I$SPDYLAY_HOME/lib/includes" LIBSPDYLAY_LIBS="-L$SPDYLAY_HOME/lib/.libs -lspdylay" - if [ "$CI_BUILD" = "autotools" ]; then ./configure --enable-werror --with-mruby --with-neverbleed LIBSPDYLAY_CFLAGS="-I$SPDYLAY_HOME/lib/includes" LIBSPDYLAY_LIBS="-L$SPDYLAY_HOME/lib/.libs -lspdylay"; fi
- if [ "$CI_BUILD" = "cmake" ]; then cmake -DENABLE_WERROR=1 -DWITH_MRUBY=1 -DWITH_NEVERBLEED=1 -DSPDYLAY_INCLUDE_DIR="$SPDYLAY_HOME/lib/includes" -DSPDYLAY_LIBRARY="$SPDYLAY_HOME/lib/.libs/libspdylay.so"; fi
script: script:
- make - make
- make check - make check