forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[libevent] Upgrade to version 2.1.10 (microsoft#6969)
- Loading branch information
Showing
7 changed files
with
98 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt | ||
index 7f8769a..debac4e 100644 | ||
--- a/fizz/CMakeLists.txt | ||
+++ b/fizz/CMakeLists.txt | ||
@@ -81,7 +81,7 @@ if(TARGET event) | ||
message(STATUS "Found libevent from package config") | ||
list(APPEND FIZZ_SHINY_DEPENDENCIES event) | ||
else() | ||
- find_package(Libevent MODULE REQUIRED) | ||
+ find_package(Libevent CONFIG REQUIRED) | ||
list(APPEND FIZZ_LINK_LIBRARIES ${LIBEVENT_LIB}) | ||
list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR}) | ||
endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
Source: libevent | ||
Version: 2.1.8-5 | ||
Version: 2.1.10 | ||
Build-Depends: openssl | ||
Homepage: https://github.com/libevent/libevent | ||
Description: An event notification library |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 44b6e18..19c024f 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -322,7 +322,7 @@ endif() | ||
# Winsock. | ||
if(WIN32) | ||
set(CMAKE_EXTRA_INCLUDE_FILES winsock2.h ws2tcpip.h) | ||
- set(CMAKE_REQUIRED_LIBRARIES ws2_32.lib) | ||
+ set(CMAKE_REQUIRED_LIBRARIES ws2_32.lib advapi32.lib shell32.lib) | ||
set(CMAKE_REQUIRED_DEFINITIONS -FIwinsock2.h -FIws2tcpip.h) | ||
endif() | ||
if (SOLARIS) | ||
diff --git a/cmake/AddEventLibrary.cmake b/cmake/AddEventLibrary.cmake | ||
index 411ca9d..869735e 100644 | ||
--- a/cmake/AddEventLibrary.cmake | ||
+++ b/cmake/AddEventLibrary.cmake | ||
@@ -73,6 +73,8 @@ macro(add_event_library LIB_NAME) | ||
list(APPEND ADD_EVENT_LIBRARY_TARGETS "${LIB_NAME}_static") | ||
|
||
set(ADD_EVENT_LIBRARY_INTERFACE "${LIB_NAME}_static") | ||
+ | ||
+ target_link_libraries("${LIB_NAME}_static" PRIVATE ${CMAKE_REQUIRED_LIBRARIES}) | ||
endif() | ||
|
||
if (${EVENT_LIBRARY_SHARED}) | ||
@@ -81,7 +83,8 @@ macro(add_event_library LIB_NAME) | ||
target_link_libraries("${LIB_NAME}_shared" | ||
${CMAKE_THREAD_LIBS_INIT} | ||
${LIB_PLATFORM} | ||
- ${LIB_LIBRARIES}) | ||
+ ${LIB_LIBRARIES} | ||
+ ${CMAKE_REQUIRED_LIBRARIES}) | ||
|
||
if (EVENT_SHARED_FLAGS) | ||
set_event_shared_lib_flags("${LIB_NAME}" "${EVENT_SHARED_FLAGS}") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 6e91c08..44b6e18 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -1430,7 +1430,7 @@ configure_file(${PROJECT_SOURCE_DIR}/cmake/LibeventConfigBuildTree.cmake.in | ||
# Calculate the relative directory from the Cmake dir. | ||
file(RELATIVE_PATH | ||
REL_INCLUDE_DIR | ||
- "${EVENT_INSTALL_CMAKE_DIR}" | ||
+ "${CURRENT_PACKAGES_DIR}/${EVENT_INSTALL_CMAKE_DIR}" | ||
"${CMAKE_INSTALL_PREFIX}/include") | ||
|
||
# Note the LIBEVENT_CMAKE_DIR is defined in LibeventConfig.cmake.in, | ||
diff --git a/cmake/AddEventLibrary.cmake b/cmake/AddEventLibrary.cmake | ||
index 9de4484..411ca9d 100644 | ||
--- a/cmake/AddEventLibrary.cmake | ||
+++ b/cmake/AddEventLibrary.cmake | ||
@@ -113,7 +113,7 @@ macro(add_event_library LIB_NAME) | ||
EXPORT LibeventTargets | ||
LIBRARY DESTINATION "lib" COMPONENT lib | ||
ARCHIVE DESTINATION "lib" COMPONENT lib | ||
- RUNTIME DESTINATION "lib" COMPONENT lib | ||
+ RUNTIME DESTINATION "bin" COMPONENT bin | ||
PUBLIC_HEADER DESTINATION "include/event2" | ||
COMPONENT dev | ||
) |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters