diff options
| author | DDoSolitary <DDoSolitary@gmail.com> | 2018-05-22 19:43:24 +0800 |
|---|---|---|
| committer | DDoSolitary <DDoSolitary@gmail.com> | 2018-05-22 19:43:24 +0800 |
| commit | 7971d70e10386bbc2cd7f646f8e99b28cde1b0c7 (patch) | |
| tree | 196c4172ced9dc32ced9b6985b4a42e839273c65 | |
| parent | b142632afdba938a7fc7386074c5d8446e1d7ab0 (diff) | |
| download | vcpkg-7971d70e10386bbc2cd7f646f8e99b28cde1b0c7.tar.gz vcpkg-7971d70e10386bbc2cd7f646f8e99b28cde1b0c7.zip | |
Fix dep to lz4 for libarchive.
Fix #3271.
| -rw-r--r-- | ports/libarchive/fix-lz4.patch | 18 | ||||
| -rw-r--r-- | ports/libarchive/portfile.cmake | 3 |
2 files changed, 20 insertions, 1 deletions
diff --git a/ports/libarchive/fix-lz4.patch b/ports/libarchive/fix-lz4.patch new file mode 100644 index 000000000..6a3d974fc --- /dev/null +++ b/ports/libarchive/fix-lz4.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 73bf07b3..76a1d61d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -515,7 +515,10 @@ IF (LZ4_INCLUDE_DIR) + ENDIF (LZ4_INCLUDE_DIR) + + FIND_PATH(LZ4_INCLUDE_DIR lz4.h) +-FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4) ++FIND_LIBRARY(LZ4_LIBRARY_DEBUG NAMES lz4d liblz4d) ++FIND_LIBRARY(LZ4_LIBRARY_RELEASE NAMES lz4 liblz4) ++INCLUDE(SelectLibraryConfigurations) ++SELECT_LIBRARY_CONFIGURATIONS(LZ4) + INCLUDE(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR) + IF(LZ4_FOUND) + +
\ No newline at end of file diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index a5bed4143..04ce714fb 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -15,7 +15,8 @@ vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/fix-buildsystem.patch
- ${CMAKE_CURRENT_LIST_DIR}/fix-dependencies.patch)
+ ${CMAKE_CURRENT_LIST_DIR}/fix-dependencies.patch
+ ${CMAKE_CURRENT_LIST_DIR}/fix-lz4.patch)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
|