cmake: support local installations of git
At least in systems where the user is local and not an administrator git will install in a subdirectory of %APPDATALOCAL%, so it makes sense to also look there for the shell needed by the cmake integration with Visual Studio. Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Carlo Marcelo Arenas Belón committed
Jul 27, 2022 at 09:05 UTC
476e54b1c604c7e0bb5265e8995e53aad1a13877
1 file changed
+1
-1
contrib/buildsystems/CMakeLists.txt
+1
-1
@@ -77,7 +77,7 @@ if(USE_VCPKG)
77
set(CMAKE_TOOLCHAIN_FILE ${VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake CACHE STRING "Vcpkg toolchain file")
78
endif()
79
80
-find_program(SH_EXE sh PATHS "C:/Program Files/Git/bin")
80
+find_program(SH_EXE sh PATHS "C:/Program Files/Git/bin" "$ENV{LOCALAPPDATA}/Programs/Git/bin")
81
if(NOT SH_EXE)
82
message(FATAL_ERROR "sh: shell interpreter was not found in your path, please install one."
83
"On Windows, you can get it as part of 'Git for Windows' install at https://gitforwindows.org/")