diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-06-19 22:29:26 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-06-19 22:30:55 -0700 |
| commit | 72229384873eccbbad2b2993e5dc5ab2946886ed (patch) | |
| tree | e941f2c9d01424460bb90e18b7c3b6692f5e05f1 | |
| parent | 84a7ec41150f6b2094995b4d206e1008f6c6c1c2 (diff) | |
| download | vcpkg-72229384873eccbbad2b2993e5dc5ab2946886ed.tar.gz vcpkg-72229384873eccbbad2b2993e5dc5ab2946886ed.zip | |
[libzip] Avoid renaming DLLs -- this breaks the import lib
| -rw-r--r-- | ports/libzip/CONTROL | 2 | ||||
| -rw-r--r-- | 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 |