[curl] Fix tools (#12758)

This commit is contained in:
NancyLi1013 2020-08-08 07:15:20 +08:00 committed by GitHub
parent 60bb798ceb
commit 23fcc57ad1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 15 deletions

View File

@ -1,13 +0,0 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5838805..d2ca468 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -103,7 +103,7 @@ target_link_libraries(${EXE_NAME} libcurl ${CURL_LIBS} ZLIB::ZLIB)
#INCLUDE(ModuleInstall OPTIONAL)
-install(TARGETS ${EXE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(TARGETS ${EXE_NAME} DESTINATION tools)
#export(TARGETS ${EXE_NAME}
# APPEND FILE ${PROJECT_BINARY_DIR}/curl-target.cmake
# NAMESPACE ${PROJECT_NAME}::

View File

@ -1,5 +1,6 @@
Source: curl
Version: 7.71.1
Port-Version: 1
Build-Depends: zlib
Homepage: https://github.com/curl/curl
Description: A library for transferring data with URLs

View File

@ -10,7 +10,6 @@ vcpkg_from_github(
0005_remove_imp_suffix.patch
0006_fix_tool_depends.patch
0007_disable_tool_export_curl_target.patch
0008_fix_tools_path.patch
0009_fix_openssl_config.patch
0010_fix_othertests_cmake.patch
)
@ -78,7 +77,7 @@ vcpkg_install_cmake()
vcpkg_copy_pdbs()
if ("tool" IN_LIST FEATURES)
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/curl)
vcpkg_copy_tools(TOOL_NAMES curl AUTO_CLEAN)
endif()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CURL)