diff options
| author | Kevin Lalumiere <kevin.lalumiere@gmail.com> | 2020-10-20 14:29:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-20 11:29:51 -0700 |
| commit | 93eed24259c325e8bd1a9b88c864b6b64d24cc16 (patch) | |
| tree | e35acd90598309efc691e639b4f5e7b962fb3bd1 | |
| parent | f8c2d42d064abc9d2e9e25c194fa68e868dc591e (diff) | |
| download | vcpkg-93eed24259c325e8bd1a9b88c864b6b64d24cc16.tar.gz vcpkg-93eed24259c325e8bd1a9b88c864b6b64d24cc16.zip | |
[curl] Fix #14049 (#14051)
| -rw-r--r-- | ports/curl/CONTROL | 1 | ||||
| -rw-r--r-- | ports/curl/portfile.cmake | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index b6df1ca45..8e833f400 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,5 +1,6 @@ Source: curl Version: 7.73.0 +Port-Version: 1 Build-Depends: zlib Homepage: https://github.com/curl/curl Description: A library for transferring data with URLs diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 5eb4533d0..cdff3010c 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -86,7 +86,7 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CURL) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_IS_LINUX) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) else() file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/curl-config DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) @@ -110,4 +110,4 @@ else() endif() file(INSTALL ${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) |