diff options
| author | Mattes D <github@xoft.cz> | 2019-09-04 23:34:54 +0200 |
|---|---|---|
| committer | peterbell10 <peterbell10@live.co.uk> | 2019-09-04 23:34:54 +0200 |
| commit | f021e2fe22fab34a48bedefe3f19533fa60754ff (patch) | |
| tree | 182543d16d4ab0c1206dcdbd9e56e1ed2879c0b0 | |
| parent | Added a basic PalettedBlockArea implementation (#4377) (diff) | |
| download | cuberite-f021e2fe22fab34a48bedefe3f19533fa60754ff.tar cuberite-f021e2fe22fab34a48bedefe3f19533fa60754ff.tar.gz cuberite-f021e2fe22fab34a48bedefe3f19533fa60754ff.tar.bz2 cuberite-f021e2fe22fab34a48bedefe3f19533fa60754ff.tar.lz cuberite-f021e2fe22fab34a48bedefe3f19533fa60754ff.tar.xz cuberite-f021e2fe22fab34a48bedefe3f19533fa60754ff.tar.zst cuberite-f021e2fe22fab34a48bedefe3f19533fa60754ff.zip | |
| -rw-r--r-- | CMakeLists.txt | 15 | ||||
| m--------- | lib/libevent | 0 | ||||
| -rw-r--r-- | src/OSSupport/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/Network/CMakeLists.txt | 4 |
4 files changed, 15 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 084c4f417..237257590 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -192,11 +192,12 @@ set(SQLITECPP_INTERNAL_SQLITE OFF CACHE BOOL "Add the internal SQLite3 source to set(SQLITE_ENABLE_COLUMN_METADATA OFF CACHE BOOL "" 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) +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) +set(EVENT__LIBRARY_TYPE "STATIC" CACHE STRING "Use static LibEvent libraries" FORCE) # Set options for JsonCPP, disabling all of their tests # Additionally, their library is output to a strange location; make sure the linker knows where to find it @@ -301,8 +302,8 @@ endif() # Put projects into solution folders in MSVC: if (MSVC) set_target_properties( - event_core - event_extra + event_core_static + event_extra_static expat fmt jsoncpp_lib_static diff --git a/lib/libevent b/lib/libevent -Subproject e4896b1b9b5fcf3a91eb19c1561fb143c0e8b1e +Subproject 4c908dde58ef780eeefcc9df4db3063ca62ea86 diff --git a/src/OSSupport/CMakeLists.txt b/src/OSSupport/CMakeLists.txt index 5513fe5c5..332b880ed 100644 --- a/src/OSSupport/CMakeLists.txt +++ b/src/OSSupport/CMakeLists.txt @@ -46,4 +46,8 @@ endif() if(NOT MSVC) add_library(OSSupport ${SRCS} ${HDRS}) target_link_libraries(OSSupport fmt::fmt) + + if(NOT WIN32) + target_link_libraries(OSSupport event_pthreads_static) + endif() endif() diff --git a/tests/Network/CMakeLists.txt b/tests/Network/CMakeLists.txt index 84c49bfed..0cc75f735 100644 --- a/tests/Network/CMakeLists.txt +++ b/tests/Network/CMakeLists.txt @@ -60,8 +60,10 @@ add_library(Network ) target_link_libraries(Network event_core event_extra fmt::fmt mbedtls) -if (MSVC) +if (WIN32) target_link_libraries(Network ws2_32.lib) +else() + target_link_libraries(Network event_pthreads_static) endif() |