summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaG1924 <lag1924@gmail.com>2021-06-07 13:00:05 +0200
committerLaG1924 <lag1924@gmail.com>2021-06-07 14:48:32 +0200
commit1e9fe310b6fdd4400048e2d5749cc0fb2437a58e (patch)
treef08ab5124f431c7931fb6f5b016409db7b517638
parentRefactored CMakeLists.txt (diff)
downloadAltCraft-1e9fe310b6fdd4400048e2d5749cc0fb2437a58e.tar
AltCraft-1e9fe310b6fdd4400048e2d5749cc0fb2437a58e.tar.gz
AltCraft-1e9fe310b6fdd4400048e2d5749cc0fb2437a58e.tar.bz2
AltCraft-1e9fe310b6fdd4400048e2d5749cc0fb2437a58e.tar.lz
AltCraft-1e9fe310b6fdd4400048e2d5749cc0fb2437a58e.tar.xz
AltCraft-1e9fe310b6fdd4400048e2d5749cc0fb2437a58e.tar.zst
AltCraft-1e9fe310b6fdd4400048e2d5749cc0fb2437a58e.zip
-rw-r--r--.travis.yml9
-rw-r--r--CMakeLists.txt4
2 files changed, 6 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index c3b14c1..11c8b32 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-dist: xenial
+dist: focal
sudo: required
language: cpp
compiler: gcc
@@ -9,9 +9,8 @@ addons:
packages:
- cmake
- g++
- - libsdl2-dev
- - libsdl2-net-dev
- - liblua5.1-0-dev
+ - libgl1-mesa-dev
+ - libglu1-mesa-dev
matrix:
include:
@@ -23,5 +22,5 @@ matrix:
script:
- mkdir build
- cd build
- - cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+ - cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOPTICK_ENABLED=OFF
- cmake --build .
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96d8e3e..3343b7e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.14)
project(AltCraft)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
include(get_cpm)
@@ -7,11 +7,11 @@ if (NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE Release)
endif()
+
############
# LIBRARIES
############
-
find_package(Threads)