From 72229384873eccbbad2b2993e5dc5ab2946886ed Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 19 Jun 2017 22:29:26 -0700 Subject: [libzip] Avoid renaming DLLs -- this breaks the import lib --- ports/libzip/CONTROL | 2 +- ports/libzip/portfile.cmake | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ports/libzip/CONTROL b/ports/libzip/CONTROL index d5fd1042e..2106a5f94 100644 --- a/ports/libzip/CONTROL +++ b/ports/libzip/CONTROL @@ -1,4 +1,4 @@ Source: libzip -Version: 1.2.0 +Version: 1.2.0-1 Build-Depends: zlib Description: A library for reading, creating, and modifying zip archives. diff --git a/ports/libzip/portfile.cmake b/ports/libzip/portfile.cmake index 62a0ddd22..fccb6cdf2 100644 --- a/ports/libzip/portfile.cmake +++ b/ports/libzip/portfile.cmake @@ -27,11 +27,9 @@ endif() vcpkg_install_cmake() -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin/zip.dll ${CURRENT_PACKAGES_DIR}/debug/bin/zipd.dll) -else() +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/zipstatic.lib ${CURRENT_PACKAGES_DIR}/lib/zip.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/zipstatic.lib ${CURRENT_PACKAGES_DIR}/debug/lib/zipd.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/zipstatic.lib ${CURRENT_PACKAGES_DIR}/debug/lib/zip.lib) endif() # Move zipconf.h to include and remove include directories from lib -- cgit v1.2.3