Skip to content
Permalink
Browse files

[RDY] Bump travis to Xenial (#1528)

* Bump to xenial

* Add ant

Not included by default in xenial

* Remove explicit gcc version

Xenial defaults to a new enough gcc.

* Bump minimum cmake version

Since Travis is bumped to Xenial we are no longer testing any CMake version
older than 3.5.
  • Loading branch information...
TheCycoONE committed Apr 25, 2019
1 parent 635a71b commit ba90e733f5162f64df1b6afb7282f1cc29c20f42
Showing with 4 additions and 5 deletions.
  1. +3 −4 .travis.yml
  2. +1 −1 CMakeLists.txt
@@ -1,17 +1,16 @@
sudo: false
dist: trusty
dist: xenial
language: cpp
compiler: gcc
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- libssl-dev
- luarocks
- doxygen
- g++-5
- sshpass
- ant

before_install:
- luarocks --local install --server=http://luarocks.org luasec OPENSSL_DIR=/usr OPENSSL_LIBDIR=/usr/lib/x86_64-linux-gnu/
@@ -33,7 +32,7 @@ install:
- cd $TRAVIS_BUILD_DIR
# Create unix makefiles
- cp $HOME/deps/travisci/cmake/FindFreetype.cmake CMake/FindFreetype.cmake
- cmake -DCMAKE_CXX_COMPILER="g++-5" -DLUA_PROGRAM_PATH=`which lua` -DWITH_AUDIO=ON -DWITH_MOVIES=ON -DWITH_LUAJIT=OFF -DCMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH;$CMAKE_INCLUDE_PATH/SDL2" -DCMAKE_LIBRARY_PATH="$CMAKE_LIBRARY_PATH" -DLUA_LIBRARY="$CMAKE_LIBRARY_PATH/liblua.so" -Bfresh -H. --debug-output
- cmake -DLUA_PROGRAM_PATH=`which lua` -DWITH_AUDIO=ON -DWITH_MOVIES=ON -DWITH_LUAJIT=OFF -DCMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH;$CMAKE_INCLUDE_PATH/SDL2" -DCMAKE_LIBRARY_PATH="$CMAKE_LIBRARY_PATH" -DLUA_LIBRARY="$CMAKE_LIBRARY_PATH/liblua.so" -Bfresh -H. --debug-output
before_script:
# Don't ask for confirmation when using scp
- echo -e "Host armedpineapple.co.uk\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
@@ -11,7 +11,7 @@
# - WITH_LIBAV : Whether to use LibAV (as opposed to FFMEPG) when building movies
# - WITH_VLD : Build with Visual Leak Detector (requires Visual Studio)

cmake_minimum_required(VERSION 3.2)
cmake_minimum_required(VERSION 3.5)

set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMake)

0 comments on commit ba90e73

Please sign in to comment.
You can’t perform that action at this time.