diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-01-07 07:09:13 +0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2020-01-06 15:09:13 -0800 |
| commit | 8101b5adaf0cf68ef6af8214bc1e1876b1bc5237 (patch) | |
| tree | 8973831a6caf7264c321479aafe5f78987788ab1 /ports | |
| parent | ee0716be5bd630714e00b26afe488a819682b7e3 (diff) | |
| download | vcpkg-8101b5adaf0cf68ef6af8214bc1e1876b1bc5237.tar.gz vcpkg-8101b5adaf0cf68ef6af8214bc1e1876b1bc5237.zip | |
[curl] Disable export of Curl::curl targets when building 'tool' feature (#8973)
* [curl]Disable export Curl::curl targets when build tool feature
* Update patch
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/curl/0007_disable_tool_export_curl_target.patch | 18 | ||||
| -rw-r--r-- | ports/curl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/curl/portfile.cmake | 1 |
3 files changed, 20 insertions, 1 deletions
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) |