From e1fc03c474a311ea658f5c2178c434c91776c9d9 Mon Sep 17 00:00:00 2001 From: Marc Boucek Date: Wed, 1 Apr 2020 16:35:38 +0200 Subject: vcpkg_from_git: Add support for git over ssh (#9446) * vcpkg_from_git: Add support for git over ssh * vcpkg_from_git: append ssh bin directory to path * vcpkg_from_git: fix function signature on non windows platforms * Revert "vcpkg_from_git: fix function signature on non windows platforms" This reverts commit 0d608ee5911d2ba274e782a21dfe77a502a39053. * Revert "vcpkg_from_git: append ssh bin directory to path" This reverts commit 377ce3fae1e2c085a5da7ace8185624a345a511b. * Partial Revert "vcpkg_from_git: Add support for git over ssh" This partially reverts commit 9b81b16c4ccd3d8646d97e66234566a07af8a308. Co-authored-by: Marc Boucek Co-authored-by: Marc Boucek --- scripts/cmake/vcpkg_from_git.cmake | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_from_git.cmake b/scripts/cmake/vcpkg_from_git.cmake index bad5384ca..f114f6fc6 100644 --- a/scripts/cmake/vcpkg_from_git.cmake +++ b/scripts/cmake/vcpkg_from_git.cmake @@ -19,7 +19,7 @@ ## This should be set to `SOURCE_PATH` by convention. ## ## ### URL -## The url of the git repository. Must start with `https`. +## The url of the git repository. ## ## ### REF ## The git sha of the commit to download. @@ -49,13 +49,6 @@ function(vcpkg_from_git) message(FATAL_ERROR "The git url must be specified") endif() - if( NOT _vdud_URL MATCHES "^https:") - # vcpkg_from_git does not support a SHA256 parameter because hashing the git archive is - # not stable across all supported platforms. The tradeoff is to require https to download - # and the ref to be the git sha (i.e. not things that can change like a label) - message(FATAL_ERROR "The git url must be https") - endif() - if(NOT DEFINED _vdud_REF) message(FATAL_ERROR "The git ref must be specified.") endif() -- cgit v1.2.3