diff options
| author | Mattes D <github@xoft.cz> | 2015-01-05 22:14:48 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2015-01-22 20:12:39 +0100 |
| commit | a8a7488b54b06b5768ae66036adea937e519b242 (patch) | |
| tree | 1baea9ee9d7b5cd69bc4c6b7ca23908b44e1ffcd | |
| parent | Merge pull request #1708 from mc-server/WarningFixes (diff) | |
| download | cuberite-a8a7488b54b06b5768ae66036adea937e519b242.tar cuberite-a8a7488b54b06b5768ae66036adea937e519b242.tar.gz cuberite-a8a7488b54b06b5768ae66036adea937e519b242.tar.bz2 cuberite-a8a7488b54b06b5768ae66036adea937e519b242.tar.lz cuberite-a8a7488b54b06b5768ae66036adea937e519b242.tar.xz cuberite-a8a7488b54b06b5768ae66036adea937e519b242.tar.zst cuberite-a8a7488b54b06b5768ae66036adea937e519b242.zip | |
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| m--------- | lib/libevent | 0 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
4 files changed, 15 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index d2ce2c855..93fac9d1f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,3 +25,6 @@ [submodule "lib/SQLiteCpp"] path = lib/SQLiteCpp url = https://github.com/mc-server/SQLiteCpp.git +[submodule "lib/libevent"] + path = lib/libevent + url = https://github.com/mc-server/libevent.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 493cecdb3..728f5c935 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,6 +95,13 @@ set(SQLITECPP_BUILD_EXAMPLES OFF CACHE BOOL "Build examples." set(SQLITECPP_BUILD_TESTS OFF CACHE BOOL "Build and run tests." FORCE) set(SQLITECPP_INTERNAL_SQLITE OFF CACHE BOOL "Add the internal SQLite3 source to the project." FORCE) +# Set options for LibEvent, disable all their tests and benchmarks: +set(EVENT__DISABLE_OPENSSL YES CACHE BOOL "Disable OpenSSL in LibEvent" FORCE) +set(EVENT__DISABLE_BENCHMARK YES CACHE BOOL "Disable LibEvent benchmarks" FORCE) +set(EVENT__DISABLE_TESTS YES CACHE BOOL "Disable LibEvent tests" FORCE) +set(EVENT__DISABLE_REGRESS YES CACHE BOOL "Disable LibEvent regression tests" FORCE) +set(EVENT__DISABLE_SAMPLES YES CACHE BOOL "Disable LibEvent samples" FORCE) + # Check that the libraries are present: if (NOT EXISTS ${CMAKE_SOURCE_DIR}/lib/SQLiteCpp/CMakeLists.txt) message(FATAL_ERROR "SQLiteCpp is missing in folder lib/SQLiteCpp. Have you initialized the submodules / downloaded the extra libraries?") @@ -102,6 +109,9 @@ endif() if (NOT EXISTS ${CMAKE_SOURCE_DIR}/lib/polarssl/CMakeLists.txt) message(FATAL_ERROR "PolarSSL is missing in folder lib/polarssl. Have you initialized the submodules / downloaded the extra libraries?") endif() +if (NOT EXISTS ${CMAKE_SOURCE_DIR}/lib/libevent/CMakeLists.txt) + message(FATAL_ERROR "LibEvent is missing in folder lib/libevent. Have you initialized and updated the submodules / downloaded the extra libraries?") +endif() # Include all the libraries: add_subdirectory(lib/jsoncpp/) @@ -112,6 +122,7 @@ add_subdirectory(lib/sqlite/) add_subdirectory(lib/SQLiteCpp/) add_subdirectory(lib/expat/) add_subdirectory(lib/luaexpat/) +add_subdirectory(lib/libevent/) # Add proper include directories so that SQLiteCpp can find SQLite3: get_property(SQLITECPP_INCLUDES DIRECTORY "lib/SQLiteCpp/" PROPERTY INCLUDE_DIRECTORIES) diff --git a/lib/libevent b/lib/libevent new file mode 160000 +Subproject 0b49ae34594533daa82c06a506078de9e336a01 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 997326cc7..50bdb0e8e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -323,4 +323,4 @@ endif () if (WIN32) target_link_libraries(${EXECUTABLE} expat tolualib ws2_32.lib Psapi.lib) endif() -target_link_libraries(${EXECUTABLE} luaexpat jsoncpp polarssl zlib sqlite lua SQLiteCpp) +target_link_libraries(${EXECUTABLE} luaexpat jsoncpp polarssl zlib sqlite lua SQLiteCpp event_core event_extra) |