From b0799bd152a5654e33703673ef81658c997dc27b Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 16 Sep 2016 10:55:38 +0200 Subject: [PATCH] fix travis build by not depending on CMake 2.8.8 --- src/CMakeLists.txt | 9 ++++----- src/kernel/CMakeLists.txt | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e12f8971f..e4d90c069 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.8) +cmake_minimum_required(VERSION 2.8) project (server C) include_directories (${CMAKE_CURRENT_SOURCE_DIR}) @@ -173,11 +173,10 @@ set (SERVER_SRC ${SERVER_SRC} ) endif(CURSES_FOUND) -add_library(version OBJECT ${VERSION_SRC}) -add_library(game ${ERESSEA_SRC} - $ -) +add_library(version STATIC ${VERSION_SRC}) +add_library(game ${ERESSEA_SRC}) add_executable(eressea ${SERVER_SRC}) +target_link_libraries(game version) target_link_libraries(eressea game ${TOLUA_LIBRARIES} diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt index 2c9da7dc0..6bb860ad7 100644 --- a/src/kernel/CMakeLists.txt +++ b/src/kernel/CMakeLists.txt @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 2.6) project(kernel C) SET(_TEST_FILES