From fe79badaefbd8f654fa31d079516f93af24533b5 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Thu, 28 Feb 2019 00:03:33 +1100
Subject: [PATCH] Travis: move all builds to CMake

---
 .travis.yml | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1dbf4a069..95a51d43c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,23 +24,6 @@ matrix:
             - g++-multilib
       env:
           - CXXFLAGS="-g -O2 -m32" CFLAGS="-g -m32"
-    - os: linux
-      compiler: clang
-      addons:
-        apt:
-          packages:
-            - expect
-            - gettext
-            - libncurses5-dev
-            - cmake
-            - libpcre2-dev
-      env:
-        - USE_CMAKE="1" # Dummy value, shows up in the Travis UI only
-      script:
-        - cmake -DCMAKE_INSTALL_PREFIX=$HOME/prefix . || cat CMakeFiles/CMakeError.log &&
-          make -j2 &&
-          make install &&
-          make test SHOW_INTERACTIVE_LOG=1
     - os: linux
       compiler: clang
       env:
@@ -58,19 +41,15 @@ matrix:
       before_install:
         - brew update
         - brew install pcre2 # use system PCRE2
-        - brew outdated xctool || brew upgrade xctool # for xcode... soon.
       env:
           - CXXFLAGS="-g -O2 -lstdc++"
   fast_finish: true
 
 script:
-  - autoreconf --no-recursive
-  - ./configure --prefix=$HOME/prefix || cat config.log
-  - make -j2 &&
-    make test DESTDIR=$HOME/prefix/ SHOW_INTERACTIVE_LOG=1 &&
-    make uninstall &&
-    echo "Checking for leftover files after make uninstall" &&
-    find $HOME/prefix/ -type f -print -exec false '{}' +
+  - cmake -DCMAKE_INSTALL_PREFIX=$HOME/prefix . || cat CMakeFiles/CMakeError.log &&
+    make -j2 &&
+    make install &&
+    make test SHOW_INTERACTIVE_LOG=1
 
 notifications:
   # Some items are encrypted so that notifications from other repositories