[curl] Disable export of Curl::curl targets when building 'tool' feat…

…ure (microsoft#8973) * [curl]Disable export Curl::curl targets when build tool feature * Update patch
andrm · Jan 6, 2020 · 8101b5a · 8101b5a
1 parent ee0716b
commit 8101b5a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/ports/curl/0007_disable_tool_export_curl_target.patch 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
@@ -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
@@ -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)