diff options
| author | Brian Callahan <dodonpachi-github@mailinator.com> | 2013-06-17 20:00:16 -0400 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-06-18 09:01:06 +0200 |
| commit | f1be42335770c4e59ad83fc69e7244c5bfb3b188 (patch) | |
| tree | 5134fd27d428c7b6d5233521fbeb94fc3139ebfb | |
| parent | daa4be8dcd74584345aa3e99da4711b708e99875 (diff) | |
| download | manaserv-f1be42335770c4e59ad83fc69e7244c5bfb3b188.tar.gz manaserv-f1be42335770c4e59ad83fc69e7244c5bfb3b188.tar.bz2 manaserv-f1be42335770c4e59ad83fc69e7244c5bfb3b188.tar.xz manaserv-f1be42335770c4e59ad83fc69e7244c5bfb3b188.zip | |
Allow manaserv to be built with external ENet
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 12 |
2 files changed, 16 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 411a7ed9..218bdd37 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,6 +13,7 @@ SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules) OPTION(WITH_SQLITE "Enable Sqlite support (used by default)" ON) OPTION(WITH_MYSQL "Enable MySQL support" OFF) OPTION(ENABLE_LUA "Enable Lua scripting support" ON) +OPTION(ENABLE_EXTERNAL_ENET "Enable external ENet support" OFF) # Exclude Sqlite support if the MySQL support was asked. IF(WITH_MYSQL) @@ -52,6 +53,11 @@ ELSE (WIN32) SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin) ENDIF (WIN32) -ADD_SUBDIRECTORY(libs/enet) +IF (ENABLE_EXTERNAL_ENET) + FIND_PACKAGE(ENet) +ELSE (ENABLE_EXTERNAL_ENET) + ADD_SUBDIRECTORY(libs/enet) +ENDIF (ENABLE_EXTERNAL_ENET) + ADD_SUBDIRECTORY(scripts) ADD_SUBDIRECTORY(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5a92e29e..968c40b9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,9 +17,15 @@ ENDIF() IF (POLICY CMP0015) CMAKE_POLICY(SET CMP0015 OLD) ENDIF() -INCLUDE_DIRECTORIES("../libs/enet/include") -LINK_DIRECTORIES("../libs/enet") -SET(INTERNAL_LIBRARIES enet) + +IF (ENABLE_EXTERNAL_ENET) + INCLUDE_DIRECTORIES(${ENet_INCLUDE_DIR}) + SET(OPTIONAL_LIBRARIES ${OPTIONAL_LIBRARIES} ${ENet_LIBRARY}) +ELSE (ENABLE_EXTERNAL_ENET) + INCLUDE_DIRECTORIES("../libs/enet/include") + LINK_DIRECTORIES("../libs/enet") + SET(INTERNAL_LIBRARIES enet) +ENDIF (ENABLE_EXTERNAL_ENET) # enable rc-handling with mingw # most likely this part can be kicked out with some later cmake version |