diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-03-20 02:05:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-20 02:05:30 -0700 |
| commit | f528d9b82f77d58d4fc589fd2ea866d71cab4dfa (patch) | |
| tree | cd29083aa3c699ffb9bb194431c239203a4de1b1 | |
| parent | 7e644cd687360c9d047b0f722201e7ea1588cb88 (diff) | |
| parent | 0b629c4ff1a56dc5045ecf9beaae59ff98b64fa5 (diff) | |
| download | vcpkg-f528d9b82f77d58d4fc589fd2ea866d71cab4dfa.tar.gz vcpkg-f528d9b82f77d58d4fc589fd2ea866d71cab4dfa.zip | |
Merge pull request #3092 from past-due/libpng_fix_vcpkg_build_type
[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. |