diff options
| author | DailyShana <8469304+DailyShana@users.noreply.github.com> | 2020-08-01 02:21:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-31 11:21:44 -0700 |
| commit | faf2d6ffb67fcf273cd0716598c6bfafb8a99d62 (patch) | |
| tree | 1e038a3f85f31ea596a10b44e3c60a721f9dbed6 /ports/libevent/fix-file_path.patch | |
| parent | 0a8857d2609d402b1854a2cc44614ccfa0ee841c (diff) | |
| download | vcpkg-faf2d6ffb67fcf273cd0716598c6bfafb8a99d62.tar.gz vcpkg-faf2d6ffb67fcf273cd0716598c6bfafb8a99d62.zip | |
[libevent] update to 2.1.12 (#12277)
* [libevent] update to 2.1.12
* fix path in LibeventConfig.cmake.in
* configure crt runtime
* patch target file
* try to fix evpp build on unix
* try to fix evpp build on unix
* try to fix evpp build on unix
* try to fix evpp build on unix
* fix file patching
* code review
* fix fizz:x64-windows build
Diffstat (limited to 'ports/libevent/fix-file_path.patch')
| -rw-r--r-- | ports/libevent/fix-file_path.patch | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/ports/libevent/fix-file_path.patch b/ports/libevent/fix-file_path.patch index 179700b7e..fb34080f8 100644 --- a/ports/libevent/fix-file_path.patch +++ b/ports/libevent/fix-file_path.patch @@ -1,26 +1,22 @@ -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 +index 04f5837..95d9808 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 - ) +@@ -42,7 +42,7 @@ macro(export_install_target TYPE LIB_NAME OUTER_INCLUDES) + install(TARGETS "${LIB_NAME}_${TYPE}" + LIBRARY DESTINATION "lib" COMPONENT lib + ARCHIVE DESTINATION "lib" COMPONENT lib +- RUNTIME DESTINATION "lib" COMPONENT lib ++ RUNTIME DESTINATION "bin" COMPONENT bin + COMPONENT dev + ) + else() +@@ -69,7 +69,7 @@ macro(export_install_target TYPE LIB_NAME OUTER_INCLUDES) + EXPORT LibeventTargets-${TYPE} + LIBRARY DESTINATION "lib" COMPONENT lib + ARCHIVE DESTINATION "lib" COMPONENT lib +- RUNTIME DESTINATION "lib" COMPONENT lib ++ RUNTIME DESTINATION "bin" COMPONENT bin + COMPONENT dev + ) + endif() |