diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-10-22 07:34:07 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-21 16:34:07 -0700 |
| commit | 0901f066c5d143a5b3c09f7c231e1b47e0ef8659 (patch) | |
| tree | 5948beb77482801cb603cdefc17ba3e48a3d4570 | |
| parent | 3df2c009df4ee02e78f72679ea15cd3f7fb6cf5b (diff) | |
| download | vcpkg-0901f066c5d143a5b3c09f7c231e1b47e0ef8659.tar.gz vcpkg-0901f066c5d143a5b3c09f7c231e1b47e0ef8659.zip | |
[libzippp] Use VCPKG_TARGET_IS_WINDOWS rather than WIN32 and avoid libzip default features (#14063)
| -rw-r--r-- | ports/libzippp/CONTROL | 3 | ||||
| -rw-r--r-- | ports/libzippp/portfile.cmake | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ports/libzippp/CONTROL b/ports/libzippp/CONTROL index 0ffb5ffc1..c9933aa42 100644 --- a/ports/libzippp/CONTROL +++ b/ports/libzippp/CONTROL @@ -1,5 +1,6 @@ Source: libzippp
Version: 4.0-1.7.3
+Port-Version: 1
Homepage: https://github.com/ctabin/libzippp
Description: Simple basic C++ wrapper around the libzip library. It is meant to be a portable and easy-to-use library for ZIP handling
-Build-Depends: zlib, libzip[bzip2]
+Build-Depends: zlib, libzip[core,bzip2]
\ No newline at end of file diff --git a/ports/libzippp/portfile.cmake b/ports/libzippp/portfile.cmake index bbedf3d54..b874ce88c 100644 --- a/ports/libzippp/portfile.cmake +++ b/ports/libzippp/portfile.cmake @@ -1,4 +1,3 @@ - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ctabin/libzippp @@ -18,7 +17,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -if(WIN32) +if(VCPKG_TARGET_IS_WINDOWS) vcpkg_fixup_cmake_targets(CONFIG_PATH "cmake/libzippp") else() vcpkg_fixup_cmake_targets(CONFIG_PATH "share/libzippp") @@ -27,4 +26,4 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENCE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libzippp RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENCE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file |