From a5747715528458dafd7184a82267eabfa00c502c Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sat, 9 May 2020 17:55:39 +1000
Subject: [PATCH] travis: attempt to acquire latest cmake from site

---
 .travis/before_install.sh | 3 ---
 .travis/install.sh        | 8 +++++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis/before_install.sh b/.travis/before_install.sh
index 8c41527d2..569d5f5bb 100644
--- a/.travis/before_install.sh
+++ b/.travis/before_install.sh
@@ -2,9 +2,6 @@
 
 if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
 
-    # CMake
-    sudo add-apt-repository ppa:olive-editor/cmake -y
-
     # Qt 5.11
     sudo add-apt-repository ppa:beineri/opt-qt-5.11.0-xenial -y
 
diff --git a/.travis/install.sh b/.travis/install.sh
index fa29d2ef8..8d57de697 100644
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -6,7 +6,13 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
 
 elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
 
-    sudo apt-get -y -o Dpkg::Options::="--force-overwrite" install qt511base qt511multimedia qt511svg qt511tools libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev cmake libopencolorio-dev libopenimageio-dev libgl1-mesa-dev
+    sudo apt-get -y -o Dpkg::Options::="--force-overwrite" install qt511base qt511multimedia qt511svg qt511tools libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev libopencolorio-dev libopenimageio-dev libgl1-mesa-dev
     source /opt/qt*/bin/qt*-env.sh
 
+    # Acquire latest cmake (apt somehow gets the wrong version?)
+    wget -c https://github.com/Kitware/CMake/releases/download/v3.17.2/cmake-3.17.2-Linux-x86_64.sh -O cmake.sh
+    chmod +x cmake.sh
+    ./cmake.sh --skip-license --prefix=cmake --exclude-dir
+    export PATH=$PWD/cmake/bin:$PATH
+
 fi