From 171f27a8aee4ce899654596a66f4a9dfa5cdf63b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20Negru=C8=9Biu?= Date: Sat, 31 Aug 2024 12:39:36 +0300 Subject: [PATCH] Minor updates to `curl` vcpkg overlay --- vcpkg/overlay_ports/curl/portfile.cmake | 6 ++++-- vcpkg/overlay_ports/curl/vcpkg.json | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/vcpkg/overlay_ports/curl/portfile.cmake b/vcpkg/overlay_ports/curl/portfile.cmake index 6a4623f..ff6ae01 100644 --- a/vcpkg/overlay_ports/curl/portfile.cmake +++ b/vcpkg/overlay_ports/curl/portfile.cmake @@ -111,6 +111,8 @@ vcpkg_cmake_configure( -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON OPTIONS_DEBUG -DENABLE_DEBUG=ON + MAYBE_UNUSED_VARIABLES + PKG_CONFIG_EXECUTABLE ) vcpkg_cmake_install() vcpkg_copy_pdbs() @@ -134,13 +136,13 @@ endif() #Fix install path vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/curl-config" "${CURRENT_PACKAGES_DIR}" "\${prefix}") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/curl-config" "${CURRENT_INSTALLED_DIR}" "\${prefix}" IGNORE_UNCHANGED) -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/curl-config" "\nprefix=\${prefix}" [=[prefix=$(CDPATH= cd -- "$(dirname -- "$0")"/../../.. && pwd -P)]=] IGNORE_UNCHANGED) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/curl-config" "\nprefix=\"\${prefix}\"" [=[prefix=$(CDPATH= cd -- "$(dirname -- "$0")"/../../.. && pwd -P)]=]) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") file(RENAME "${CURRENT_PACKAGES_DIR}/bin/curl-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/curl-config") if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/curl-config") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "${CURRENT_PACKAGES_DIR}" "\${prefix}") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "${CURRENT_INSTALLED_DIR}" "\${prefix}" IGNORE_UNCHANGED) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "\nprefix=\${prefix}/debug" [=[prefix=$(CDPATH= cd -- "$(dirname -- "$0")"/../../../.. && pwd -P)]=] IGNORE_UNCHANGED) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "\nprefix=\"\${prefix}/debug\"" [=[prefix=$(CDPATH= cd -- "$(dirname -- "$0")"/../../../.. && pwd -P)]=]) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "-lcurl" "-l${namespec}-d") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "curl." "curl-d.") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin") diff --git a/vcpkg/overlay_ports/curl/vcpkg.json b/vcpkg/overlay_ports/curl/vcpkg.json index 776956a..832caf5 100644 --- a/vcpkg/overlay_ports/curl/vcpkg.json +++ b/vcpkg/overlay_ports/curl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "curl", "version": "8.9.1", + "port-version": 1, "description": "A library for transferring data with URLs", "homepage": "https://curl.se/", "license": "curl AND ISC AND BSD-3-Clause",