flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Updated LibEvent to release 2.1.11-stable. (#4383)

Browse Source 
This finally restores my ability to compile on Windows and Linux from the same source folder (on a network drive).

LibEvent broke this long ago by writing a config file into the source folder, rather than build folder. Now it's finally fixed.
This commit is contained in:
Mattes D 2019-09-04 23:34:54 +02:00 committed by peterbell10
parent 2504538a3a
commit f021e2fe22
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -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(SQLITE_ENABLE_COLUMN_METADATA OFF CACHE BOOL "" FORCE)
# Set options for LibEvent, disable all their tests and benchmarks: # 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_OPENSSL YES CACHE BOOL "Disable OpenSSL in LibEvent" FORCE)
set(EVENT__DISABLE_BENCHMARK YES CACHE BOOL "Disable LibEvent benchmarks" 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_TESTS YES CACHE BOOL "Disable LibEvent tests" FORCE)
set(EVENT__DISABLE_REGRESS YES CACHE BOOL "Disable LibEvent regression 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_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 # 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 # 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: # Put projects into solution folders in MSVC:
if (MSVC) if (MSVC)
set_target_properties( set_target_properties(
event_core event_core_static
event_extra event_extra_static
expat expat
fmt fmt
jsoncpp_lib_static jsoncpp_lib_static

2
lib/libevent

@ -1 +1 @@
Subproject commit e4896b1b9b5fcf3a91eb19c1561fb143c0e8b1e5 Subproject commit 4c908dde58ef780eeefcc9df4db3063ca62ea862

4
src/OSSupport/CMakeLists.txt
View File

@ -46,4 +46,8 @@ endif()
if(NOT MSVC) if(NOT MSVC)
add_library(OSSupport ${SRCS} ${HDRS}) add_library(OSSupport ${SRCS} ${HDRS})
target_link_libraries(OSSupport fmt::fmt) target_link_libraries(OSSupport fmt::fmt)
if(NOT WIN32)
target_link_libraries(OSSupport event_pthreads_static)
endif()
endif() endif()

4
tests/Network/CMakeLists.txt
View File

@ -60,8 +60,10 @@ add_library(Network
) )
target_link_libraries(Network event_core event_extra fmt::fmt mbedtls) target_link_libraries(Network event_core event_extra fmt::fmt mbedtls)
if (MSVC) if (WIN32)
target_link_libraries(Network ws2_32.lib) target_link_libraries(Network ws2_32.lib)
else()
target_link_libraries(Network event_pthreads_static)
endif() endif()