diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-12-01 03:02:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 11:02:53 -0800 |
| commit | 2fbd692f56c2a94f1805320a4abf2d366f116cc0 (patch) | |
| tree | 0f3fa5aed78444c803b9e687ed4dfe7ec6bc2c92 | |
| parent | 94fe8409336e2d86092bbde83bb80750cfe09d8a (diff) | |
| download | vcpkg-2fbd692f56c2a94f1805320a4abf2d366f116cc0.tar.gz vcpkg-2fbd692f56c2a94f1805320a4abf2d366f116cc0.zip | |
[libevent] Fix library cannot be found (#14805)
| -rw-r--r-- | ports/libevent/CONTROL | 1 | ||||
| -rw-r--r-- | ports/libevent/fix-LibeventConfig_cmake_in_path.patch | 15 | ||||
| -rw-r--r-- | ports/libevent/portfile.cmake | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/ports/libevent/CONTROL b/ports/libevent/CONTROL index fd98e588a..b51c55e9f 100644 --- a/ports/libevent/CONTROL +++ b/ports/libevent/CONTROL @@ -1,5 +1,6 @@ Source: libevent
Version: 2.1.12
+Port-Version: 1
Homepage: https://github.com/libevent/libevent
Description: An event notification library
Supports: !uwp
diff --git a/ports/libevent/fix-LibeventConfig_cmake_in_path.patch b/ports/libevent/fix-LibeventConfig_cmake_in_path.patch index 9566f152c..819380bec 100644 --- a/ports/libevent/fix-LibeventConfig_cmake_in_path.patch +++ b/ports/libevent/fix-LibeventConfig_cmake_in_path.patch @@ -1,13 +1,22 @@ diff --git a/cmake/LibeventConfig.cmake.in b/cmake/LibeventConfig.cmake.in -index 7b808c3..fbf67be 100644 +index 7b808c3..9376a5a 100644 --- a/cmake/LibeventConfig.cmake.in +++ b/cmake/LibeventConfig.cmake.in @@ -58,7 +58,7 @@ endif() - + # Get the path of the current file. get_filename_component(LIBEVENT_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(_INSTALL_PREFIX "${LIBEVENT_CMAKE_DIR}/../../.." ABSOLUTE) +get_filename_component(_INSTALL_PREFIX "${LIBEVENT_CMAKE_DIR}/../.." ABSOLUTE) - + macro(message_if_needed _flag _msg) if (NOT ${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY) +@@ -131,7 +131,7 @@ if(CONFIG_FOR_INSTALL_TREE) + find_library(_event_lib + NAMES "event_${_comp}" + PATHS "${_INSTALL_PREFIX}/lib" +- NO_DEFAULT_PATH) ++ ) + if(_event_lib) + list(APPEND LIBEVENT_LIBRARIES "libevent::${_comp}") + set_case_insensitive_found(${_comp}) diff --git a/ports/libevent/portfile.cmake b/ports/libevent/portfile.cmake index 9865cecea..d6b02bbf7 100644 --- a/ports/libevent/portfile.cmake +++ b/ports/libevent/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} does not currently support UWP" ON_TARGET "uwp") +vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH |