From 8101b5adaf0cf68ef6af8214bc1e1876b1bc5237 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Tue, 7 Jan 2020 07:09:13 +0800 Subject: [curl] Disable export of Curl::curl targets when building 'tool' feature (#8973) * [curl]Disable export Curl::curl targets when build tool feature * Update patch --- ports/curl/0007_disable_tool_export_curl_target.patch | 18 ++++++++++++++++++ ports/curl/CONTROL | 2 +- ports/curl/portfile.cmake | 1 + 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 ports/curl/0007_disable_tool_export_curl_target.patch diff --git a/ports/curl/0007_disable_tool_export_curl_target.patch b/ports/curl/0007_disable_tool_export_curl_target.patch new file mode 100644 index 000000000..3361f1b3a --- /dev/null +++ b/ports/curl/0007_disable_tool_export_curl_target.patch @@ -0,0 +1,18 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index b376cd1..baffe7e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -71,8 +71,8 @@ target_link_libraries(${EXE_NAME} libcurl ${CURL_LIBS} ZLIB::ZLIB) + + #INCLUDE(ModuleInstall OPTIONAL) + +-install(TARGETS ${EXE_NAME} EXPORT ${TARGETS_EXPORT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) +-export(TARGETS ${EXE_NAME} +- APPEND FILE ${PROJECT_BINARY_DIR}/curl-target.cmake +- NAMESPACE CURL:: +-) ++install(TARGETS ${EXE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) ++#export(TARGETS ${EXE_NAME} ++# APPEND FILE ${PROJECT_BINARY_DIR}/curl-target.cmake ++# NAMESPACE CURL:: ++#) diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 1022e223b..fd9f428f9 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,5 +1,5 @@ Source: curl -Version: 7.66.0-1 +Version: 7.66.0-2 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 2b6514886..36837f93d 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( 0004_nghttp2_staticlib.patch 0005_remove_imp_suffix.patch 0006_fix_tool_depends.patch + 0007_disable_tool_export_curl_target.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB) -- cgit v1.2.3