diff options
| author | Barath Kannan <barathsotd@gmail.com> | 2017-12-27 16:57:43 +1100 |
|---|---|---|
| committer | Barath Kannan <barathsotd@gmail.com> | 2017-12-27 16:57:43 +1100 |
| commit | d8f0ea999983892b8e5e49340ece3474ee257156 (patch) | |
| tree | ce9b615075350d90d0b7312874bae6dd202fe93b /ports/zlib | |
| parent | 22e9a2b25db21e1d1a1f75786442f2c90ae0db0c (diff) | |
| parent | 6e05f9cdf5cf4d53153214f4d4b29133b368bc4d (diff) | |
| download | vcpkg-d8f0ea999983892b8e5e49340ece3474ee257156.tar.gz vcpkg-d8f0ea999983892b8e5e49340ece3474ee257156.zip | |
resolve merge conflicts
Diffstat (limited to 'ports/zlib')
| -rw-r--r-- | ports/zlib/portfile.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index ec8b05ffc..963b86d24 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -27,8 +27,10 @@ vcpkg_install_cmake() # Both dynamic and static are built, so keep only the one needed if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/zlibstatic.lib ${CURRENT_PACKAGES_DIR}/lib/zlib.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/zlibstaticd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/zlibd.lib) + if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/zlibstatic.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/zlibstatic.lib ${CURRENT_PACKAGES_DIR}/lib/zlib.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/zlibstaticd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/zlibd.lib) + endif() endif() file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/zlib RENAME copyright) |