diff options
| author | past-due <30942300+past-due@users.noreply.github.com> | 2018-03-19 20:15:49 -0400 |
|---|---|---|
| committer | past-due <30942300+past-due@users.noreply.github.com> | 2018-03-19 20:15:49 -0400 |
| commit | 0b629c4ff1a56dc5045ecf9beaae59ff98b64fa5 (patch) | |
| tree | 6f1f12f76cb155005214d9cd5c708b70ef1b583a | |
| parent | 5968ebf9f4beae3a0662dfc6ba343b0be07a1241 (diff) | |
| download | vcpkg-0b629c4ff1a56dc5045ecf9beaae59ff98b64fa5.tar.gz vcpkg-0b629c4ff1a56dc5045ecf9beaae59ff98b64fa5.zip | |
[libpng] Fix static build failure when VCPKG_BUILD_TYPE is set
| -rw-r--r-- | ports/libpng/portfile.cmake | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake index 1ac8ef3cb..0c9f8ab0b 100644 --- a/ports/libpng/portfile.cmake +++ b/ports/libpng/portfile.cmake @@ -40,9 +40,13 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND EXISTS ${CURRENT_PACKAGES_DIR}/lib/libpng16_static.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libpng16_static.lib ${CURRENT_PACKAGES_DIR}/lib/libpng16.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libpng16_staticd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libpng16d.lib) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/libpng16_static.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libpng16_static.lib ${CURRENT_PACKAGES_DIR}/lib/libpng16.lib) + endif() + if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/libpng16_staticd.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libpng16_staticd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libpng16d.lib) + endif() endif() # Remove CMake config files as they are incorrectly generated and everyone uses built-in FindPNG anyway. |