diff options
author | Petri Lehtinen <petri@digip.org> | 2014-01-28 06:02:17 -0800 |
---|---|---|
committer | Petri Lehtinen <petri@digip.org> | 2014-01-28 06:02:17 -0800 |
commit | a721d36f4143faa94c78e447515994891ce9c30f (patch) | |
tree | 500c77c0091913dd377ee90bf5c579513296d5a8 | |
parent | eee85cd53cfebd67dfc02df9f952baef6be8df48 (diff) | |
parent | 4c2cc0e36c01c13532e70dfc7ac0e1fc3cbe1336 (diff) | |
download | jansson-a721d36f4143faa94c78e447515994891ce9c30f.zip jansson-a721d36f4143faa94c78e447515994891ce9c30f.tar.gz jansson-a721d36f4143faa94c78e447515994891ce9c30f.tar.bz2 |
Merge pull request #161 from JoakimSoderberg/cmake_travis
Add CMake build to Travis config.
-rw-r--r-- | .travis.yml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 1cca274..452ed17 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,14 @@ +env: + matrix: + - JANSSON_BUILD_METHOD=cmake JANSSON_CMAKE_OPTIONS="-DJANSSON_TEST_WITH_VALGRIND=ON" JANSSON_EXTRA_INSTALL="valgrind" + - JANSSON_BUILD_METHOD=autotools language: c compiler: - gcc - clang -script: autoreconf -f -i && CFLAGS=-Werror ./configure && make check +install: + - sudo apt-get update -qq + - sudo apt-get install -y -qq cmake $JANSSON_EXTRA_INSTALL +script: + - if [ "$JANSSON_BUILD_METHOD" = "autotools" ]; then autoreconf -f -i && CFLAGS=-Werror ./configure && make check; fi + - if [ "$JANSSON_BUILD_METHOD" = "cmake" ]; then mkdir build && cd build && cmake .. $JANSSON_CMAKE_OPTIONS && cmake --build . && ctest --output-on-failure; fi |