> find_program(SH_EXE sh) > 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/";) > + set(SH_EXE "C:/Program Files/Git/bin/sh.exe") > + if(NOT EXISTS ${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/";) > + endif() > endif() You can write the find_program() command more succinctly as: find_program(SH_EXE sh PATHS "C:/Program Files/Git/bin") PATHS is is a list of extra directories to search, which are usually hard-coded guesses[1]. This way we avoid an extra check and indentation level. I found my Visual Studio installation already contains a sh.exe. I think it ships with VS by default; I can't even find a way to remove it. It's located at: C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\usr\bin\sh.exe When I started writing this up I figured that could serve as an additional fallback. However, if I use that shell I have to add (...)/usr/bin to PATH as the various scripts need expr and sed among other things. I get the same result if I search "C:/Program Files/Git/usr/bin", but there is no equivalent (...)/bin in the Git included with VS for some reason. For the curious I have attached the patch that ended up working, but I doubt it's worth including (except the simplified if(NOT...) logic). Øsse. [1]: https://cmake.org/cmake/help/latest/command/find_program.html diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt index 5007f173f1..baa46e4e97 100644 --- a/contrib/buildsystems/CMakeLists.txt +++ b/contrib/buildsystems/CMakeLists.txt @@ -41,10 +41,17 @@ cmake_minimum_required(VERSION 3.14) #set the source directory to root of git set(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/../..) -find_program(SH_EXE sh) +find_program(SH_EXE sh + PATHS "C:/Program Files/Git/bin" + "$ENV{VSINSTALLDIR}/Common7/IDE/CommonExtensions/Microsoft/TeamFoundation/Team Explorer/Git/usr/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/";) +else() + # Make sure various utilities are available in PATH + get_filename_component(dir "${SH_EXE}" DIRECTORY) + set(ENV{PATH} "$ENV{PATH};${dir}") endif() #Create GIT-VERSION-FILE using GIT-VERSION-GEN
