From 878d7ea830412dcda31a4d4c6589fe9e0015fe5a Mon Sep 17 00:00:00 2001 From: Matioupi Date: Fri, 20 Nov 2020 21:18:17 +0100 Subject: [curl] Fixes pkgconfig configuration file (#14350) * Fix pkgconfig for windows debug build. Re-allow tool feature on non windows platforms * Fix tool feature * Modified debug/release prvate libs according to https://github.com/microsoft/vcpkg/pull/14350#discussion_r520444862 Added vcpkg_fixup_pkgconfig() according to https://github.com/microsoft/vcpkg/pull/14350#discussion_r520435718 * Delete portfile.cmake.orig * Fix pkgconfig * Revert "Fix pkgconfig" This reverts commit cb4da8bcc5e92248c20065f34d5e5d1d88a0e5d4. * Bump port version to 3 * add missing system libs for windows. made case type coherent for ws2_32 * Fix build on x64-linux triplet * Reverted ws2_32 to Ws2_32 as discudssed in https://github.com/microsoft/vcpkg/pull/14350#discussion_r525893479 * More fixes for Linux build with features * Fix for feature c-ares * Formatting Co-authored-by: Phoebe Ma --- scripts/cmake/vcpkg_common_definitions.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_common_definitions.cmake b/scripts/cmake/vcpkg_common_definitions.cmake index 1689dc762..ee5288db2 100644 --- a/scripts/cmake/vcpkg_common_definitions.cmake +++ b/scripts/cmake/vcpkg_common_definitions.cmake @@ -193,4 +193,6 @@ if(VCPKG_TARGET_IS_WINDOWS) list(APPEND VCPKG_SYSTEM_LIBRARIES winmm) list(APPEND VCPKG_SYSTEM_LIBRARIES wsock32) list(APPEND VCPKG_SYSTEM_LIBRARIES Ws2_32) + list(APPEND VCPKG_SYSTEM_LIBRARIES wldap32) + list(APPEND VCPKG_SYSTEM_LIBRARIES crypt32) endif() -- cgit v1.2.3