mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-10 10:23:49 +08:00
6a9ecfd57f
* Modernize portfile * Don't export implicit link libraries * Revise osx framework handling * Fix exported per-config location of dependencies * Move curl-config to tools, incl. debug variant * Update to 7.77.0 * Add WinIDN support and default IDN selection * Use pkgconfig for libidn2 configuration * Update to 0.78.0 * Remove obsolete nghttp2 staticlib patch * Fix libs duplication in pc file * Resolve transitive deps for pc file/curl-config * x-add-version * Fix winssl dependencies * Add winldap feature, not default * Update git-tree Co-authored-by: past-due <30942300+past-due@users.noreply.github.com>
26 lines
879 B
Diff
26 lines
879 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 09d82f1..f0d99e6 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1507,6 +1507,7 @@ else()
|
|
set(ENABLE_SHARED "no")
|
|
set(ENABLE_STATIC "yes")
|
|
set(LIBCURL_NO_SHARED "${LIBCURL_LIBS}")
|
|
+ set(LIBCURL_LIBS "")
|
|
endif()
|
|
# "a" (Linux) or "lib" (Windows)
|
|
string(REPLACE "." "" libext "${CMAKE_STATIC_LIBRARY_SUFFIX}")
|
|
diff --git a/curl-config.in b/curl-config.in
|
|
index 8b4a29a..e756ae8 100644
|
|
--- a/curl-config.in
|
|
+++ b/curl-config.in
|
|
@@ -172,7 +172,7 @@ while test $# -gt 0; do
|
|
|
|
--static-libs)
|
|
if test "X@ENABLE_STATIC@" != "Xno" ; then
|
|
- echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@
|
|
+ echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_NO_SHARED@
|
|
else
|
|
echo "curl was built with static libraries disabled" >&2
|
|
exit 1
|