summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-08-08 20:13:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-08-08 20:13:13 (GMT)
commit6d97f440e55bb4cfa3ab277876099568b2073c28 (patch)
treed14c7aa46babac4f138f8a92e5a397b97236bb59
parent679aad9e82d0dfd8ef3d1f98fa4629665496cec9 (diff)
parent476e54b1c604c7e0bb5265e8995e53aad1a13877 (diff)
downloadgit-6d97f440e55bb4cfa3ab277876099568b2073c28.zip
git-6d97f440e55bb4cfa3ab277876099568b2073c28.tar.gz
git-6d97f440e55bb4cfa3ab277876099568b2073c28.tar.bz2
Merge branch 'ca/unignore-local-installation-on-windows'
Fix build procedure for Windows that uses CMake so that it can pick up the shell interpreter from local installation location. * ca/unignore-local-installation-on-windows: cmake: support local installations of git
-rw-r--r--contrib/buildsystems/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 1b23f24..2237109 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -77,7 +77,7 @@ if(USE_VCPKG)
set(CMAKE_TOOLCHAIN_FILE ${VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake CACHE STRING "Vcpkg toolchain file")
endif()
-find_program(SH_EXE sh PATHS "C:/Program Files/Git/bin")
+find_program(SH_EXE sh PATHS "C:/Program Files/Git/bin" "$ENV{LOCALAPPDATA}/Programs/Git/bin")
if(NOT SH_EXE)
message(FATAL_ERROR "sh: shell interpreter was not found in your path, please install one."
"On Windows, you can get it as part of 'Git for Windows' install at https://gitforwindows.org/")