aboutsummaryrefslogtreecommitdiff
path: root/toolsrc
diff options
context:
space:
mode:
authorMarc Boucek <mohinda@gmail.com>2020-04-01 16:35:38 +0200
committerGitHub <noreply@github.com>2020-04-01 07:35:38 -0700
commite1fc03c474a311ea658f5c2178c434c91776c9d9 (patch)
tree2c83b38ed2e720009adab8981635cb866cf3d28f /toolsrc
parente12c1acdb52c859ed07b86da110103426d3467db (diff)
downloadvcpkg-e1fc03c474a311ea658f5c2178c434c91776c9d9.tar.gz
vcpkg-e1fc03c474a311ea658f5c2178c434c91776c9d9.zip
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 <marc.boucek@native-instruments.de> Co-authored-by: Marc Boucek <marc.boucek@posteo.net>
Diffstat (limited to 'toolsrc')
-rw-r--r--toolsrc/src/vcpkg/base/system.process.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/toolsrc/src/vcpkg/base/system.process.cpp b/toolsrc/src/vcpkg/base/system.process.cpp
index bba29a2d7..5f34ace2a 100644
--- a/toolsrc/src/vcpkg/base/system.process.cpp
+++ b/toolsrc/src/vcpkg/base/system.process.cpp
@@ -241,6 +241,12 @@ namespace vcpkg
// Enables proxy information to be passed to Curl, the underlying download library in cmake.exe
L"http_proxy",
L"https_proxy",
+ // Environment variables to tell git to use custom SSH executable or command
+ L"GIT_SSH",
+ L"GIT_SSH_COMMAND",
+ // Environment variables needed for ssh-agent based authentication
+ L"SSH_AUTH_SOCK",
+ L"SSH_AGENT_PID",
// Enables find_package(CUDA) and enable_language(CUDA) in CMake
L"CUDA_PATH",
L"CUDA_PATH_V9_0",