From 935ba67d279901f6268464b49381f9f4a2dd4b94 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sat, 4 May 2013 15:47:53 -0700
Subject: [PATCH] update to latest CMakelists.txt build files

---
 CMakeLists.txt     |  8 +++++++-
 cmake              |  2 +-
 eressea            |  2 +-
 quicklist          |  2 +-
 src/CMakeLists.txt | 14 +++++++++-----
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49a9a58ff..ec4682b8f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,14 @@
 cmake_minimum_required(VERSION 2.6)
-project (e4-server C)
+project (arda-server C)
 
 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 (quicklist)
 add_subdirectory (iniparser)
diff --git a/cmake b/cmake
index 8cbbeef52..92b721b05 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 8cbbeef52b5807bdec52369322cbc9f21d5ed621
+Subproject commit 92b721b05086d95d7d87112d740f3bd80d9dc9e6
diff --git a/eressea b/eressea
index 841876e33..1db73ac4c 160000
--- a/eressea
+++ b/eressea
@@ -1 +1 @@
-Subproject commit 841876e3359e49d059704ee7b5aa7a138447f871
+Subproject commit 1db73ac4c7fc135e97debe27b246c9f81e0c03c6
diff --git a/quicklist b/quicklist
index 9426da896..1164cda67 160000
--- a/quicklist
+++ b/quicklist
@@ -1 +1 @@
-Subproject commit 9426da89690972fea3d594c7843a8f172c75c7ca
+Subproject commit 1164cda6777c69981d456b69019575f868aeb536
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5655da466..8a6e78665 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,11 +1,12 @@
 cmake_minimum_required(VERSION 2.6)
 project (server C)
 
-find_package (Lua51 REQUIRED)
-find_package (LibXml2 REQUIRED)
-find_package (SQLite3 REQUIRED)
-find_package (ToLua REQUIRED)
-find_package (Curses REQUIRED)
+IF(CMAKE_COMPILER_IS_GNUCC)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -Wall -Werror -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith -Wno-char-subscripts -Wno-long-long")
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -DHAVE__BOOL")
+ELSE(CMAKE_COMPILER_IS_GNUCC)
+    MESSAGE(STATUS "Unknown compiler ${CMAKE_C_COMPILER_ID}")
+ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
 include_directories (${ERESSEA_INCLUDE_DIR})
 include_directories (${CRITBIT_INCLUDE_DIR})
@@ -16,11 +17,14 @@ include_directories (${LUA_INCLUDE_DIR})
 include_directories (${LIBXML2_INCLUDE_DIR})
 include_directories (${BSON_INCLUDE_DIR})
 include_directories (${INIPARSER_INCLUDE_DIR})
+include_directories (${CURSES_INCLUDE_DIR})
 
 add_executable(server main.c)
 target_link_libraries(server
   ${ERESSEA_LIBRARY}
   ${BINDINGS_LIBRARY}
   ${TOLUA_LIBRARIES}
+  ${LUA_LIBRARIES}
   ${SQLITE3_LIBRARIES}
+  ${CURSES_LIBRARIES}
 )