From e701bfd596fc79fc7e35ce69341e26e85601ea80 Mon Sep 17 00:00:00 2001
From: Michael Steinert <mike.steinert@gmail.com>
Date: Thu, 5 Jul 2018 11:52:34 -0500
Subject: [PATCH] Add CMake to the CI matrix

---
 .travis-ci/install.sh                         |  2 ++
 .travis-ci/{script.sh => script-autotools.sh} |  0
 .travis-ci/script-cmake.sh                    |  8 ++++++++
 .travis.yml                                   | 14 +++++++++++++-
 4 files changed, 23 insertions(+), 1 deletion(-)
 rename .travis-ci/{script.sh => script-autotools.sh} (100%)
 create mode 100755 .travis-ci/script-cmake.sh

diff --git a/.travis-ci/install.sh b/.travis-ci/install.sh
index ba91136..577d1a5 100755
--- a/.travis-ci/install.sh
+++ b/.travis-ci/install.sh
@@ -7,10 +7,12 @@ apt-get install -qq \
     build-essential \
     check \
     clang \
+    cmake \
     graphviz-dev \
     libjemalloc-dev \
     libpcre3-dev \
     libtool \
+    ninja-build \
     pkg-config
 
 if [ x$COVERALLS == xyes ]; then
diff --git a/.travis-ci/script.sh b/.travis-ci/script-autotools.sh
similarity index 100%
rename from .travis-ci/script.sh
rename to .travis-ci/script-autotools.sh
diff --git a/.travis-ci/script-cmake.sh b/.travis-ci/script-cmake.sh
new file mode 100755
index 0000000..3a80810
--- /dev/null
+++ b/.travis-ci/script-cmake.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -ev
+
+mkdir build && cd build
+cmake -GNinja ..
+ninja -v
+ctest
diff --git a/.travis.yml b/.travis.yml
index 80ccbaa..6c4e186 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ matrix:
   include:
   - compiler: gcc
     env:
+    - TYPE=autotools
     - CONFIGURE_OPTION='--enable-debug --enable-gcov --with-malloc=jemalloc'
     - COVERALLS=yes
     - VALGRIND=no
@@ -19,6 +20,7 @@ matrix:
     - CXX=g++
   - compiler: gcc
     env:
+    - TYPE=autotools
     - CONFIGURE_OPTION='--enable-debug --enable-gcov'
     - COVERALLS=yes
     - VALGRIND=yes
@@ -27,12 +29,22 @@ matrix:
     - CXX=g++
   - compiler: clang
     env:
+    - TYPE=autotools
     - CONFIGURE_OPTION='--enable-debug --enable-gcov'
     - COVERALLS=yes
     - VALGRIND=yes
     - DEBUG=yes
     - CC=clang
     - CXX=clang++
+  - compiler: gcc
+    env:
+    - TYPE=cmake
+    - CONFIGURE_OPTION='--enable-debug --enable-gcov'
+    - COVERALLS=yes
+    - VALGRIND=yes
+    - DEBUG=yes
+    - CC=gcc
+    - CXX=g++
 
 before_install:
   - docker run -d
@@ -52,7 +64,7 @@ install:
   - docker exec -t build bash -c "cd /travis && .travis-ci/install.sh"
 
 script:
-  - docker exec -t build bash -c "cd /travis && .travis-ci/script.sh"
+  - docker exec -t build bash -c "cd /travis && .travis-ci/script-$TYPE.sh"
 
 after_success:
   - docker exec -t build bash -c "cd /travis && .travis-ci/after_success.sh"