зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
bbea4dcf42
Коммит
476e54b1c6
|
@ -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/")
|
||||
|
|
Загрузка…
Ссылка в новой задаче