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

moving the find_package calls out into the parent project(s).

This commit is contained in:
Enno Rehling 2013-05-04 14:18:58 -07:00
parent 2ced59467d
commit 7975249f6a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -3,10 +3,16 @@ project (e3-server C)
enable_testing() 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 (crypto)
add_subdirectory (quicklist) add_subdirectory (quicklist)
add_subdirectory (iniparser) add_subdirectory (iniparser)
add_subdirectory (cutest) add_subdirectory (cutest)
add_subdirectory (critbit) add_subdirectory (critbit)
add_subdirectory (src server)
add_subdirectory (eressea/src eressea) add_subdirectory (eressea/src eressea)

2
eressea

@ -1 +1 @@
Subproject commit f76dfc71c9da6a2eddaee886fff6b38d08372423 Subproject commit 1db73ac4c7fc135e97debe27b246c9f81e0c03c6

6
src/CMakeLists.txt
View File

@ -8,12 +8,6 @@ ELSE(CMAKE_COMPILER_IS_GNUCC)
MESSAGE(STATUS "Unknown compiler ${CMAKE_C_COMPILER_ID}") MESSAGE(STATUS "Unknown compiler ${CMAKE_C_COMPILER_ID}")
ENDIF(CMAKE_COMPILER_IS_GNUCC) 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 (${ERESSEA_INCLUDE_DIR})
include_directories (${CRITBIT_INCLUDE_DIR}) include_directories (${CRITBIT_INCLUDE_DIR})
include_directories (${CRYPTO_INCLUDE_DIR}) include_directories (${CRYPTO_INCLUDE_DIR})