diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-10-26 05:28:11 +0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-10-25 14:28:11 -0700 |
| commit | d3a7830335274d2b8af203521d7314edd8019b48 (patch) | |
| tree | e9f4eaee92dced32ccfcce218ffc03671d2285a5 | |
| parent | 3b868ac7695942fa252001720a494457c9b88d02 (diff) | |
| download | vcpkg-d3a7830335274d2b8af203521d7314edd8019b48.tar.gz vcpkg-d3a7830335274d2b8af203521d7314edd8019b48.zip | |
[curl]Fix tools depends zlib. (#8739)
| -rw-r--r-- | ports/curl/0006_fix_tool_depends.patch | 22 | ||||
| -rw-r--r-- | ports/curl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/curl/portfile.cmake | 1 |
3 files changed, 24 insertions, 1 deletions
diff --git a/ports/curl/0006_fix_tool_depends.patch b/ports/curl/0006_fix_tool_depends.patch new file mode 100644 index 000000000..67fd62d92 --- /dev/null +++ b/ports/curl/0006_fix_tool_depends.patch @@ -0,0 +1,22 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 63e2b94..b376cd1 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -40,6 +40,8 @@ if(MSVC) + list(APPEND CURL_FILES curl.rc) + endif() + ++find_package(ZLIB REQUIRED) ++ + # CURL_FILES comes from Makefile.inc + add_executable( + ${EXE_NAME} +@@ -59,7 +61,7 @@ include_directories( + ) + + #Build curl executable +-target_link_libraries(${EXE_NAME} libcurl ${CURL_LIBS}) ++target_link_libraries(${EXE_NAME} libcurl ${CURL_LIBS} ZLIB::ZLIB) + + ################################################################################ + diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 9c0471e42..1022e223b 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,5 +1,5 @@ Source: curl -Version: 7.66.0 +Version: 7.66.0-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 e315d23a3..2b6514886 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_github( 0003_fix_libraries.patch 0004_nghttp2_staticlib.patch 0005_remove_imp_suffix.patch + 0006_fix_tool_depends.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB) |