From 93eed24259c325e8bd1a9b88c864b6b64d24cc16 Mon Sep 17 00:00:00 2001 From: Kevin Lalumiere Date: Tue, 20 Oct 2020 14:29:51 -0400 Subject: [PATCH] [curl] Fix #14049 (#14051) --- ports/curl/CONTROL | 1 + ports/curl/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index b6df1ca455..8e833f4009 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 5eb4533d02..cdff3010c5 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)