update to latest CMakelists.txt build files

This commit is contained in:
Enno Rehling 2013-05-04 15:47:53 -07:00
parent 64046250d4
commit 935ba67d27
5 changed files with 19 additions and 9 deletions

View File

@ -1,8 +1,14 @@
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
project (e4-server C) project (arda-server C)
enable_testing() enable_testing()
find_package (Lua 5 REQUIRED)
find_package (ToLua REQUIRED)
find_package (LibXml2 REQUIRED)
find_package (Curses REQUIRED)
find_package (SQLite3 REQUIRED)
add_subdirectory (crypto) add_subdirectory (crypto)
add_subdirectory (quicklist) add_subdirectory (quicklist)
add_subdirectory (iniparser) add_subdirectory (iniparser)

2
cmake

@ -1 +1 @@
Subproject commit 8cbbeef52b5807bdec52369322cbc9f21d5ed621 Subproject commit 92b721b05086d95d7d87112d740f3bd80d9dc9e6

@ -1 +1 @@
Subproject commit 841876e3359e49d059704ee7b5aa7a138447f871 Subproject commit 1db73ac4c7fc135e97debe27b246c9f81e0c03c6

@ -1 +1 @@
Subproject commit 9426da89690972fea3d594c7843a8f172c75c7ca Subproject commit 1164cda6777c69981d456b69019575f868aeb536

View File

@ -1,11 +1,12 @@
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
project (server C) project (server C)
find_package (Lua51 REQUIRED) IF(CMAKE_COMPILER_IS_GNUCC)
find_package (LibXml2 REQUIRED) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -Wall -Werror -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith -Wno-char-subscripts -Wno-long-long")
find_package (SQLite3 REQUIRED) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -DHAVE__BOOL")
find_package (ToLua REQUIRED) ELSE(CMAKE_COMPILER_IS_GNUCC)
find_package (Curses REQUIRED) MESSAGE(STATUS "Unknown compiler ${CMAKE_C_COMPILER_ID}")
ENDIF(CMAKE_COMPILER_IS_GNUCC)
include_directories (${ERESSEA_INCLUDE_DIR}) include_directories (${ERESSEA_INCLUDE_DIR})
include_directories (${CRITBIT_INCLUDE_DIR}) include_directories (${CRITBIT_INCLUDE_DIR})
@ -16,11 +17,14 @@ include_directories (${LUA_INCLUDE_DIR})
include_directories (${LIBXML2_INCLUDE_DIR}) include_directories (${LIBXML2_INCLUDE_DIR})
include_directories (${BSON_INCLUDE_DIR}) include_directories (${BSON_INCLUDE_DIR})
include_directories (${INIPARSER_INCLUDE_DIR}) include_directories (${INIPARSER_INCLUDE_DIR})
include_directories (${CURSES_INCLUDE_DIR})
add_executable(server main.c) add_executable(server main.c)
target_link_libraries(server target_link_libraries(server
${ERESSEA_LIBRARY} ${ERESSEA_LIBRARY}
${BINDINGS_LIBRARY} ${BINDINGS_LIBRARY}
${TOLUA_LIBRARIES} ${TOLUA_LIBRARIES}
${LUA_LIBRARIES}
${SQLITE3_LIBRARIES} ${SQLITE3_LIBRARIES}
${CURSES_LIBRARIES}
) )