diff options
| author | Julian Scholle <julian.scholle@iff.fraunhofer.de> | 2019-10-11 16:55:50 +0200 |
|---|---|---|
| committer | Julian Scholle <julian.scholle@iff.fraunhofer.de> | 2019-10-11 16:55:50 +0200 |
| commit | c309af4c71a39414290f9a13c3ae499f4fd9e306 (patch) | |
| tree | b68d5eb83856eb31ce038c36fffc05956c2db63d | |
| parent | fa7a3eaec35409d60dbc456d5229b54c192f11de (diff) | |
| download | vcpkg-c309af4c71a39414290f9a13c3ae499f4fd9e306.tar.gz vcpkg-c309af4c71a39414290f9a13c3ae499f4fd9e306.zip | |
fix mixed release and debug build (was always using zstd release)
| -rw-r--r-- | ports/libarchive/fix-zstd.patch | 28 | ||||
| -rw-r--r-- | ports/libarchive/portfile.cmake | 3 |
2 files changed, 30 insertions, 1 deletions
diff --git a/ports/libarchive/fix-zstd.patch b/ports/libarchive/fix-zstd.patch new file mode 100644 index 000000000..5c3b6cd54 --- /dev/null +++ b/ports/libarchive/fix-zstd.patch @@ -0,0 +1,28 @@ +From 9397ed51eddf43481d5710eb80441ce4a64356ea Mon Sep 17 00:00:00 2001 +From: Julian Scholle <julian.scholle@iff.fraunhofer.de> +Date: Fri, 11 Oct 2019 16:46:06 +0200 +Subject: [PATCH] test + +--- + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 13da432..911ae5b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -588,7 +588,10 @@ IF(ENABLE_ZSTD) + ENDIF (ZSTD_INCLUDE_DIR) + + FIND_PATH(ZSTD_INCLUDE_DIR zstd.h) +- FIND_LIBRARY(ZSTD_LIBRARY NAMES zstd libzstd) ++ FIND_LIBRARY(ZSTD_LIBRARY_DEBUG NAMES zstdd libzstdd) ++ FIND_LIBRARY(ZSTD_LIBRARY_RELEASE NAMES zstd libzstd) ++ INCLUDE(SelectLibraryConfigurations) ++ SELECT_LIBRARY_CONFIGURATIONS(ZSTD) + INCLUDE(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZSTD DEFAULT_MSG ZSTD_LIBRARY ZSTD_INCLUDE_DIR) + ELSE(ENABLE_ZSTD) +-- +2.16.1.windows.1 + diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index c3973d8ab..3b69a69b9 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -7,13 +7,14 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libarchive/libarchive
- REF 614110e76d9dbb9ed3e159a71cbd75fa3b23efe3 + REF 614110e76d9dbb9ed3e159a71cbd75fa3b23efe3
SHA512 8feac2c0e22e5b7c05f3be97c774ad82d39bdea4b3fa3a2b297b85f8a5a9f548c528ef63f5495afd42fb75759e03a4108f3831b27103f899f8fe4ef7e8e2d1cf
HEAD_REF master
PATCHES
fix-buildsystem.patch
fix-dependencies.patch
fix-lz4.patch
+ fix-zstd.patch
)
set(BUILD_libarchive_bzip2 OFF)
|