mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-25 14:29:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
f40b738108
vcpkg/ports/curl/0001_cmake.patch

29 lines
766 B
Diff
Raw Normal View History

Add a patch for curl to find the libssh2 library
2016-12-07 16:04:49 +08:00
diff --git a/CMake/FindLibSSH2.cmake b/CMake/FindLibSSH2.cmake
[ports] fix curl 001 patch, update nghttp2 to 1.33.0
2018-09-05 22:13:31 +08:00
index 84822dba7..0d6219425 100644
Add a patch for curl to find the libssh2 library
2016-12-07 16:04:49 +08:00
--- a/CMake/FindLibSSH2.cmake
+++ b/CMake/FindLibSSH2.cmake
[ports] fix curl 001 patch, update nghttp2 to 1.33.0
2018-09-05 22:13:31 +08:00
@@ -12,7 +12,7 @@ endif()
find_path(LIBSSH2_INCLUDE_DIR libssh2.h
Add a patch for curl to find the libssh2 library
2016-12-07 16:04:49 +08:00
)
[ports] fix curl 001 patch, update nghttp2 to 1.33.0
2018-09-05 22:13:31 +08:00
-find_library(LIBSSH2_LIBRARY NAMES ssh2
+find_library(LIBSSH2_LIBRARY NAMES ssh2 libssh2
Add a patch for curl to find the libssh2 library
2016-12-07 16:04:49 +08:00
)
if(LIBSSH2_INCLUDE_DIR)
curl: update to v7.57.0 Due to changes in curl's CMake support, where it now installs .cmake files, we now have to make sure that they are installed into the correct directory (and not duplicated into the debug/share/ directory, either). Also, a change in the context of the 2nd patch required an update of said patch. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2017-12-05 21:57:14 +08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
[ports] fix curl 001 patch, update nghttp2 to 1.33.0
2018-09-05 22:13:31 +08:00
index e6dbb73f1..1e2ff138e 100644
curl: update to v7.57.0 Due to changes in curl's CMake support, where it now installs .cmake files, we now have to make sure that they are installed into the correct directory (and not duplicated into the debug/share/ directory, either). Also, a change in the context of the 2nd patch required an update of said patch. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2017-12-05 21:57:14 +08:00
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
[ports] fix curl 001 patch, update nghttp2 to 1.33.0
2018-09-05 22:13:31 +08:00
@@ -1144,7 +1144,9 @@ function(TRANSFORM_MAKEFILE_INC INPUT_FILE OUTPUT_FILE)
curl: update to v7.57.0 Due to changes in curl's CMake support, where it now installs .cmake files, we now have to make sure that they are installed into the correct directory (and not duplicated into the debug/share/ directory, either). Also, a change in the context of the 2nd patch required an update of said patch. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2017-12-05 21:57:14 +08:00
endfunction()
-if(WIN32 AND NOT CYGWIN)
+if(MSVC)
[ports] fix curl 001 patch, update nghttp2 to 1.33.0
2018-09-05 22:13:31 +08:00
+ set(CURL_INSTALL_CMAKE_DIR share/curl)
curl: update to v7.57.0 Due to changes in curl's CMake support, where it now installs .cmake files, we now have to make sure that they are installed into the correct directory (and not duplicated into the debug/share/ directory, either). Also, a change in the context of the 2nd patch required an update of said patch. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2017-12-05 21:57:14 +08:00
+elseif(WIN32 AND NOT CYGWIN)
[ports] fix curl 001 patch, update nghttp2 to 1.33.0
2018-09-05 22:13:31 +08:00
set(CURL_INSTALL_CMAKE_DIR CMake)
curl: update to v7.57.0 Due to changes in curl's CMake support, where it now installs .cmake files, we now have to make sure that they are installed into the correct directory (and not duplicated into the debug/share/ directory, either). Also, a change in the context of the 2nd patch required an update of said patch. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2017-12-05 21:57:14 +08:00
else()
[ports] fix curl 001 patch, update nghttp2 to 1.33.0
2018-09-05 22:13:31 +08:00
set(CURL_INSTALL_CMAKE_DIR lib/cmake/curl)
Reference in New Issue Copy Permalink