From a00a345507dec819664aecf8891aa2653978f483 Mon Sep 17 00:00:00 2001 From: Alvin <52727318+AlvinZhangH@users.noreply.github.com> Date: Tue, 7 Jan 2020 04:38:35 +0800 Subject: [libevent] Fix include headers fails on x64-windows, using CMAKE (#9292) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [libevent] Fix include headers fails on x64-windows, using CMAKE * [libevent] Fix conflicting file portfile.cmake * [libevent] Update the CONTROL version Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/libevent/CONTROL | 2 +- ports/libevent/fix-LibeventConfig_cmake_in_path.patch | 13 +++++++++++++ ports/libevent/portfile.cmake | 3 ++- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 ports/libevent/fix-LibeventConfig_cmake_in_path.patch diff --git a/ports/libevent/CONTROL b/ports/libevent/CONTROL index 8f1199680..7ad8ab9e9 100644 --- a/ports/libevent/CONTROL +++ b/ports/libevent/CONTROL @@ -1,5 +1,5 @@ Source: libevent -Version: 2.1.11-2 +Version: 2.1.11-3 Build-Depends: openssl Homepage: https://github.com/libevent/libevent Description: An event notification library diff --git a/ports/libevent/fix-LibeventConfig_cmake_in_path.patch b/ports/libevent/fix-LibeventConfig_cmake_in_path.patch new file mode 100644 index 000000000..b444ae3e7 --- /dev/null +++ b/ports/libevent/fix-LibeventConfig_cmake_in_path.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/LibeventConfig.cmake.in b/cmake/LibeventConfig.cmake.in +index 5422336..d436100 100644 +--- a/cmake/LibeventConfig.cmake.in ++++ b/cmake/LibeventConfig.cmake.in +@@ -8,7 +8,7 @@ + get_filename_component(LIBEVENT_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) + + # Set the include directories. +-set(LIBEVENT_INCLUDE_DIRS "@EVENT_INSTALL_INCLUDE_DIR@") ++set(LIBEVENT_INCLUDE_DIRS "${LIBEVENT_CMAKE_DIR}/../../include") + + # Include the project Targets file, this contains definitions for IMPORTED targets. + include(${LIBEVENT_CMAKE_DIR}/LibeventTargets.cmake) diff --git a/ports/libevent/portfile.cmake b/ports/libevent/portfile.cmake index 711f5e93d..bd44d8428 100644 --- a/ports/libevent/portfile.cmake +++ b/ports/libevent/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( PATCHES fix-file_path.patch fix-crt_linkage.patch + fix-LibeventConfig_cmake_in_path.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -54,4 +55,4 @@ endif() vcpkg_copy_pdbs() #Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -- cgit v1.2.3