diff options
| author | Alvin <52727318+AlvinZhangH@users.noreply.github.com> | 2020-01-07 04:38:35 +0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2020-01-06 12:38:35 -0800 |
| commit | a00a345507dec819664aecf8891aa2653978f483 (patch) | |
| tree | 1ead9d806a07300c36a6db64e9f608f70bd179ad | |
| parent | f8165f72709cce797058164b389a105ca4c412a9 (diff) | |
| download | vcpkg-a00a345507dec819664aecf8891aa2653978f483.tar.gz vcpkg-a00a345507dec819664aecf8891aa2653978f483.zip | |
[libevent] Fix include headers fails on x64-windows, using CMAKE (#9292)
* [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>
| -rw-r--r-- | ports/libevent/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libevent/fix-LibeventConfig_cmake_in_path.patch | 13 | ||||
| -rw-r--r-- | ports/libevent/portfile.cmake | 3 |
3 files changed, 16 insertions, 2 deletions
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) |