diff options
| author | Thomas Fussell <thomas.fussell@gmail.com> | 2017-01-01 18:28:56 -0500 |
|---|---|---|
| committer | Thomas Fussell <thomas.fussell@gmail.com> | 2017-01-01 18:28:56 -0500 |
| commit | 32dd084deadecd726172b85239c30bbbf683f62b (patch) | |
| tree | 492044fa3bce12e930d6c565d92095d71fac68e5 /ports/curl | |
| parent | 937c246ac2aa6ec11a02d0cb36a4e50919842c8a (diff) | |
| parent | bc8cca82a297e37bf9dde387991c1d51618273b7 (diff) | |
| download | vcpkg-32dd084deadecd726172b85239c30bbbf683f62b.tar.gz vcpkg-32dd084deadecd726172b85239c30bbbf683f62b.zip | |
Merge branch 'master' of http://github.com/Microsoft/vcpkg
Diffstat (limited to 'ports/curl')
| -rw-r--r-- | ports/curl/0001_cmake.patch | 13 | ||||
| -rw-r--r-- | ports/curl/CONTROL | 4 | ||||
| -rw-r--r-- | ports/curl/portfile.cmake | 6 |
3 files changed, 21 insertions, 2 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/CONTROL b/ports/curl/CONTROL index bca23865d..e18ea2f67 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,4 +1,4 @@ Source: curl -Version: 7.51.0-1 -Build-Depends: zlib, openssl +Version: 7.51.0-2 +Build-Depends: zlib, openssl, libssh2 Description: A library for transferring data with URLs 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() |