diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2019-11-26 07:57:43 +0800 |
|---|---|---|
| committer | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-11-25 15:57:43 -0800 |
| commit | 61dc5580d6e57ad4ad025a7d47d0af3de7998007 (patch) | |
| tree | 4410abd663e6a334ba93622dcfc1c0cfac26b7d6 | |
| parent | 73c3e33c4a9bf2bc2b67bb172b72730e707344e3 (diff) | |
| download | vcpkg-61dc5580d6e57ad4ad025a7d47d0af3de7998007.tar.gz vcpkg-61dc5580d6e57ad4ad025a7d47d0af3de7998007.zip | |
[libpng] Fix CMake targets (#8716)
* [libpng] fix cmake targets
* fix typo issue
* Merge changes from PR#8293
| -rw-r--r-- | ports/libpng/portfile.cmake | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake index 36e2c245a..829719d3f 100644 --- a/ports/libpng/portfile.cmake +++ b/ports/libpng/portfile.cmake @@ -65,6 +65,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/libpng) + 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) @@ -72,17 +74,21 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") 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() + + foreach(FILE ${CURRENT_PACKAGES_DIR}/share/libpng/libpng16-release.cmake ${CURRENT_PACKAGES_DIR}/share/libpng/libpng16-debug.cmake) + file(READ ${FILE} _contents) + string(REGEX REPLACE "libpng16_static.lib" "libpng16.lib" _contents "${_contents}") + string(REGEX REPLACE "libpng16_staticd.lib" "libpng16d.lib" _contents "${_contents}") + file(WRITE ${FILE} "${_contents}") + endforeach() endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/libpng) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share/) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/libpngConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/libpng) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/libpngConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libpng) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libpng/LICENSE ${CURRENT_PACKAGES_DIR}/share/libpng/copyright) +if(NOT VCPKG_TARGET_IS_WINDOWS) + file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/png) +endif() vcpkg_copy_pdbs() - -if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/png) -endif() +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) |