3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

fix(libarchive): fix lz4 patch to align with upstream

Browse Source 
* Fix fix-lz4.patch.
* Switch base to v3.3.3 for fix-lz4.patch.
This commit is contained in:
DDoSolitary 2019-02-08 06:42:50 +08:00 committed by Codiferous
parent 3155a7c79a
commit 728c993bc4
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ports/libarchive/fix-lz4.patch
View File

@ -1,18 +1,16 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73bf07b3..76a1d61d 100644
index 80871bc9..2a16dc70 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)
@@ -517,7 +517,10 @@ IF(ENABLE_LZ4)
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)
ELSE(ENABLE_LZ4)