aboutsummaryrefslogtreecommitdiff
path: root/ports/libssh2
diff options
context:
space:
mode:
authorAybe <aybe@users.noreply.github.com>2018-08-08 21:15:47 +0200
committerAybe <aybe@users.noreply.github.com>2018-08-08 21:15:47 +0200
commit61820777517d669e00fbdeb2368e156b66396b51 (patch)
tree57e0d31ff7b8fc3f85fd3bfe98148ef715149b6c /ports/libssh2
parent8cfc78e890b18762f1f5d0aff346c397de2e6d56 (diff)
parent13e19f10ea83985708320542cbf05217b4da9969 (diff)
downloadvcpkg-61820777517d669e00fbdeb2368e156b66396b51.tar.gz
vcpkg-61820777517d669e00fbdeb2368e156b66396b51.zip
Merge branch 'master' into liblzma-uwp
Diffstat (limited to 'ports/libssh2')
-rw-r--r--ports/libssh2/CONTROL2
-rw-r--r--ports/libssh2/portfile.cmake20
2 files changed, 10 insertions, 12 deletions
diff --git a/ports/libssh2/CONTROL b/ports/libssh2/CONTROL
index d050bf838..4a95c72b6 100644
--- a/ports/libssh2/CONTROL
+++ b/ports/libssh2/CONTROL
@@ -1,4 +1,4 @@
Source: libssh2
-Version: 1.8.0-3
+Version: 1.8.0-4
Build-Depends: zlib, openssl
Description: The SSH library
diff --git a/ports/libssh2/portfile.cmake b/ports/libssh2/portfile.cmake
index 9e5e5c025..e080cf81e 100644
--- a/ports/libssh2/portfile.cmake
+++ b/ports/libssh2/portfile.cmake
@@ -1,16 +1,14 @@
include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libssh2-1.8.0)
-vcpkg_download_distfile(ARCHIVE_FILE
- URLS "https://www.libssh2.org/download/libssh2-1.8.0.tar.gz"
- FILENAME "libssh2-1.8.0.tar.gz"
- SHA512 289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558
-)
-vcpkg_extract_source_archive(${ARCHIVE_FILE})
-vcpkg_apply_patches(
- SOURCE_PATH ${SOURCE_PATH}
- PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-UWP.patch
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO libssh2/libssh2
+ REF libssh2-1.8.0
+ SHA512 c157db0628126d6348ed52a698fbdd7e20b54b6115123bd7d238f02fda5c68ca7a1585aed8a2376df0840f4a3823743133996192001ae54864ab53c954b938e7
+ HEAD_REF master
+ PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Fix-UWP.patch"
)
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
@@ -33,4 +31,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libssh2)
file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libssh2 RENAME copyright)
-vcpkg_copy_pdbs() \ No newline at end of file
+vcpkg_copy_pdbs()