Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix travis build by not depending on CMake 2.8.8

This commit is contained in:
Enno Rehling 2016-09-16 10:55:38 +02:00
parent 00a3a934f5
commit bf59b1adf9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.8) cmake_minimum_required(VERSION 2.8)
project (server C) project (server C)
include_directories (${CMAKE_CURRENT_SOURCE_DIR}) include_directories (${CMAKE_CURRENT_SOURCE_DIR})
@ -171,11 +171,10 @@ set (SERVER_SRC ${SERVER_SRC}
) )
endif(CURSES_FOUND) endif(CURSES_FOUND)
add_library(version OBJECT ${VERSION_SRC}) add_library(version STATIC ${VERSION_SRC})
add_library(game ${ERESSEA_SRC} add_library(game ${ERESSEA_SRC})
$<TARGET_OBJECTS:version>
)
add_executable(eressea ${SERVER_SRC}) add_executable(eressea ${SERVER_SRC})
target_link_libraries(game version)
target_link_libraries(eressea target_link_libraries(eressea
game game
${TOLUA_LIBRARIES} ${TOLUA_LIBRARIES}

1
src/kernel/CMakeLists.txt
View File

@ -1,3 +1,4 @@
cmake_minimum_required(VERSION 2.6)
project(kernel C) project(kernel C)
SET(_TEST_FILES SET(_TEST_FILES