From 7de08fbd8f6349092bc1ab6088f748a15e87f4e0 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 3 Jun 2012 18:47:43 -0700 Subject: [PATCH] complete rewrite of cmake files --- CMakeLists.txt | 68 +++++--------------------------------------------- 1 file changed, 6 insertions(+), 62 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a960c02fc..1363fea63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,67 +1,11 @@ cmake_minimum_required(VERSION 2.4) -project (server C) +project (server) -## CMake configuration ## -# You can pass these to cmake with -DNEED_OPTION=1 -# -# if your system does not have libsqlite3-dev installed: -# set(NEED_SQLITE 1) +enable_testing() -if (${CMAKE_C_COMPILER} MATCHES ".*tcc") - set(CMAKE_C_FLAGS "-Wall -g") - add_definitions(-DTINYCC) -endif(${CMAKE_C_COMPILER} MATCHES ".*tcc") +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../cmake/Modules/") -if (${CMAKE_C_COMPILER} MATCHES ".*gcc") - set(CMAKE_C_FLAGS "-g -Wall -Werror -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith -Wno-char-subscripts -pedantic -Wno-long-long") -endif(${CMAKE_C_COMPILER} MATCHES ".*gcc") +add_subdirectory (../dependencies "${CMAKE_CURRENT_BINARY_DIR}/dependencies") +add_subdirectory (../core/src "${CMAKE_CURRENT_BINARY_DIR}/core") -if (WIN32) - add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE) - include_directories ( ../dependencies/pdcurses ) -else (WIN32) - include_directories ( /usr/include/lua5.1/ /usr/include/libxml2 ) -endif (WIN32) - -include_directories ( - ../dependencies/bson - ../dependencies/crypto - ../dependencies/cutest - ../dependencies/critbit - ../dependencies/iniparser - ../dependencies/quicklist - ../core/src -) - -set (LIB_SRCS - ../dependencies/bson/bson.c - ../dependencies/bson/numbers.c - ../dependencies/critbit/critbit.c - ../dependencies/crypto/md5.c - ../dependencies/crypto/mt19937ar.c - ../dependencies/cutest/CuTest.c - ../dependencies/dlmalloc/malloc.c - ../dependencies/quicklist/quicklist.c - ../dependencies/iniparser/iniparser.c - ../core/src/build/gamecode.c - ../core/src/build/kernel.c - ../core/src/build/lib.c - ../core/src/build/util.c -) - -set (LINK_LIBS tolua xml2 ncurses lua5.1 pthread) - -if (NEED_SQLITE) - set( LIB_SRCS ${LIB_SRCS} ../dependencies/sqlite3/sqlite3.c ) - include_directories ( ../dependencies/sqlite3 ) -else (NEED_SQLITE) - set ( LINK_LIBS ${LINK_LIBS} sqlite3 ) -endif (NEED_SQLITE) - -set ( EXE_SRCS src/server.c ) - -add_executable ( server ${LIB_SRCS} ${EXE_SRCS} ) -if (WIN32) -else (WIN32) - target_link_libraries (server ${LINK_LIBS}) -endif (WIN32) +add_subdirectory(src server)