From b3c20d3b8ed547b73e4e7a8b6517f55212d91f84 Mon Sep 17 00:00:00 2001
From: evpobr <evpobr@gmail.com>
Date: Thu, 25 Apr 2019 09:48:15 +0500
Subject: [PATCH] Integrate CMake to Travis CI tests

* Add CMake builds with ENABLE_64_BIT_WORDS enabled\disabled
* Run tests in parallel jobs
* Use Xenial Travis image to support CMake >= 3.12
* Install libtool-bin package missing in Xenial image
---
 .travis.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b2af50be..64fac310 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,17 +4,22 @@ os:
   - linux
   - osx
 
+dist: xenial
+
 compiler:
   - gcc
   - clang
 
 env:
-  -
-  - CONFIGURE_OPTS=--enable-64-bit-words
-
+  matrix:
+  - BUILD_SYSTEM="autotools" CONFIGURE_OPTS=
+  - BUILD_SYSTEM="autotools" CONFIGURE_OPTS=--enable-64-bit-words
+  - BUILD_SYSTEM="cmake"     CONFIGURE_OPTS=
+  - BUILD_SYSTEM="cmake"     CONFIGURE_OPTS=-DENABLE_64_BIT_WORDS=ON
 install:
-  - if [ $TRAVIS_OS_NAME = linux ]; then sudo apt-get -y install libogg-dev; fi
+  - if [ $TRAVIS_OS_NAME = linux ]; then sudo apt-get -y install libtool-bin libogg-dev; fi
   - if [ $TRAVIS_OS_NAME = osx ]; then brew install libogg; fi
 
 script:
-  - ./autogen.sh && ./configure $CONFIGURE_OPTS && make && make check
+  - if [[ "${BUILD_SYSTEM}" == "autotools" ]]; then ./autogen.sh && ./configure $CONFIGURE_OPTS && make && make check; fi
+  - if [[ "${BUILD_SYSTEM}" == "cmake" ]]; then mkdir cmake-build && cd cmake-build && cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON $CONFIGURE_OPTS && cmake --build . && ctest -V; fi