Skip to content

Commit 2794e81

Browse files
committed
Merge branch 'ca/unignore-local-installation-on-windows' into maint
Fix build procedure for Windows that uses CMake so that it can pick up the shell interpreter from local installation location. source: <[email protected]> * ca/unignore-local-installation-on-windows: cmake: support local installations of git
2 parents ad60ddd + 476e54b commit 2794e81

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

contrib/buildsystems/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ if(USE_VCPKG)
7777
set(CMAKE_TOOLCHAIN_FILE ${VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake CACHE STRING "Vcpkg toolchain file")
7878
endif()
7979

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")
8181
if(NOT SH_EXE)
8282
message(FATAL_ERROR "sh: shell interpreter was not found in your path, please install one."
8383
"On Windows, you can get it as part of 'Git for Windows' install at https://gitforwindows.org/")

0 commit comments

Comments
 (0)