diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-03-20 02:00:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-20 02:00:31 -0700 |
| commit | 246327286400928ab912e402621e0142495cea8b (patch) | |
| tree | 53762d791926303deda5b31243da6f27cb8009cd | |
| parent | e4c976922668ecb80a0015b7e80e50e07b7db6e8 (diff) | |
| parent | 71dc69e2135c3ec4e2dbd23c4ef8692dba6b9177 (diff) | |
| download | vcpkg-246327286400928ab912e402621e0142495cea8b.tar.gz vcpkg-246327286400928ab912e402621e0142495cea8b.zip | |
Merge pull request #3090 from past-due/zlib_fix_vcpkg_build_type
[zlib] Fix static build failure when VCPKG_BUILD_TYPE is set
| -rw-r--r-- | ports/zlib/portfile.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index 291180a29..d924e2135 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -32,6 +32,8 @@ vcpkg_install_cmake() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/zlibstatic.lib) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/zlibstatic.lib ${CURRENT_PACKAGES_DIR}/lib/zlib.lib) + endif() + if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/zlibstaticd.lib) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/zlibstaticd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/zlibd.lib) endif() endif() |