Use latest CMake on TravisCI

suratovvlad · May 1, 2020 · 22f1688 · 22f1688
1 parent 4f82016
commit 22f1688
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -81,7 +81,10 @@ before_install:
     if [ "$TRAVIS_OS_NAME" = "linux" ]; then
       # setup virtual display for after_success target
       if [ "$gui" = "true" ]; then export "DISPLAY=:99.0" && /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 ; fi ;
-
+      # CMake from Kitware is installed in /usr/bin
+      # TravisCI installs its own cmake to another location which ovverides other installations
+      # if they don't call the new binary directly
+      alias cmake="/usr/bin/cmake"
     fi
   - |
     if [ "$TRAVIS_OS_NAME" = "osx" ]; then
@@ -111,6 +114,7 @@ install:
       PATH="/usr/local/opt/ccache/libexec:$PATH"
 
       brew update > /dev/null
+      brew upgrade cmake
       brew install ccache colormake boost openssl qt zlib
       brew link --force qt zlib
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,6 +6,11 @@ if(POLICY CMP0074)
     cmake_policy(SET CMP0074 NEW)
 endif()
 
+# TODO: fix the macOS bundle stuff
+if(POLICY CMP0080)
+    cmake_policy(SET CMP0080 OLD)
+endif()
+
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
 include(FunctionReadVersion)