diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-12-09 12:42:28 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2016-12-09 12:42:28 -0800 |
| commit | daec2527870129b95e4fc690429502e1578a868e (patch) | |
| tree | ec658093645844873491ab4787ca42e714cfec57 | |
| parent | 1abda7dd2a7155e39b9115bcd98b854972f095f0 (diff) | |
| parent | 93d83e0a60a6e66f91a1cf9d02a490ca01348958 (diff) | |
| download | vcpkg-daec2527870129b95e4fc690429502e1578a868e.tar.gz vcpkg-daec2527870129b95e4fc690429502e1578a868e.zip | |
Merge branch 'CurlWithSSH2' of https://github.com/cguebert/vcpkg into cguebert-CurlWithSSH2
| -rw-r--r-- | ports/curl/0001_cmake.patch | 13 | ||||
| -rw-r--r-- | ports/curl/portfile.cmake | 6 |
2 files changed, 19 insertions, 0 deletions
diff --git a/ports/curl/0001_cmake.patch b/ports/curl/0001_cmake.patch new file mode 100644 index 000000000..db281e122 --- /dev/null +++ b/ports/curl/0001_cmake.patch @@ -0,0 +1,13 @@ +diff --git a/CMake/FindLibSSH2.cmake b/CMake/FindLibSSH2.cmake +index 12a7c61..9839c67 100644 +--- a/CMake/FindLibSSH2.cmake ++++ b/CMake/FindLibSSH2.cmake +@@ -12,7 +12,7 @@ endif (LIBSSH2_INCLUDE_DIR AND LIBSSH2_LIBRARY) + FIND_PATH(LIBSSH2_INCLUDE_DIR libssh2.h + ) + +-FIND_LIBRARY(LIBSSH2_LIBRARY NAMES ssh2 ++FIND_LIBRARY(LIBSSH2_LIBRARY NAMES ssh2 libssh2 + ) + + if(LIBSSH2_INCLUDE_DIR) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index e2359f73d..01c76718b 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -7,6 +7,12 @@ vcpkg_download_distfile(ARCHIVE_FILE ) vcpkg_extract_source_archive(${ARCHIVE_FILE}) +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch +) + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) SET(CURL_STATICLIB OFF) else() |