From 7975249f6a8c7ce59b53a5dc91ac2c6d7c0bfbe2 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sat, 4 May 2013 14:18:58 -0700
Subject: [PATCH] moving the find_package calls out into the parent project(s).

---
 CMakeLists.txt     | 8 +++++++-
 eressea            | 2 +-
 src/CMakeLists.txt | 6 ------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b3dfdc15..eacd1bc1c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,10 +3,16 @@ project (e3-server C)
 
 enable_testing()
 
-add_subdirectory (src server)
+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)
 add_subdirectory (cutest)
 add_subdirectory (critbit)
+add_subdirectory (src server)
 add_subdirectory (eressea/src eressea)
diff --git a/eressea b/eressea
index f76dfc71c..1db73ac4c 160000
--- a/eressea
+++ b/eressea
@@ -1 +1 @@
-Subproject commit f76dfc71c9da6a2eddaee886fff6b38d08372423
+Subproject commit 1db73ac4c7fc135e97debe27b246c9f81e0c03c6
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 52eeee45c..0eb069c74 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,12 +8,6 @@ ELSE(CMAKE_COMPILER_IS_GNUCC)
     MESSAGE(STATUS "Unknown compiler ${CMAKE_C_COMPILER_ID}")
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
-find_package (Lua 5 REQUIRED)
-find_package (LibXml2 REQUIRED)
-find_package (SQLite3 REQUIRED)
-find_package (ToLua REQUIRED)
-find_package (Curses REQUIRED)
-
 include_directories (${ERESSEA_INCLUDE_DIR})
 include_directories (${CRITBIT_INCLUDE_DIR})
 include_directories (${CRYPTO_INCLUDE_DIR})