Skip to content
Snippets Groups Projects
Commit 8cb959d5 authored by Lars Bilke's avatar Lars Bilke
Browse files

[CMake] Find Git before everything else.

parent 3cc40c3b
No related branches found
No related tags found
No related merge requests found
......@@ -29,14 +29,15 @@ option(OGS_BUILD_TESTS "Should the test executables be built?" ON)
option(OGS_USE_PCH "Should pre-compiled headers be used?" ON)
### CMake includes ###
include(scripts/cmake/PreFind.cmake)
include(scripts/cmake/ConanSetup.cmake)
include(scripts/cmake/CheckTypeSizes.cmake)
include(scripts/cmake/Functions.cmake)
include(scripts/cmake/SubmoduleSetup.cmake)
include(scripts/cmake/CMakeSetup.cmake)
include(scripts/cmake/CompilerSetup.cmake)
include(scripts/cmake/Find.cmake)
include(scripts/cmake/CCacheSetup.cmake)
include(scripts/cmake/SubmoduleSetup.cmake)
include(scripts/cmake/ProjectSetup.cmake)
include(scripts/cmake/DocumentationSetup.cmake)
include(scripts/cmake/test/Test.cmake)
......
......@@ -21,18 +21,6 @@ find_package(cppcheck QUIET)
find_package(PythonInterp QUIET)
# Check for cmder git installed via chocolatey
find_program(GIT_EXECUTABLE
NAMES git
PATHS C:/tools/cmder/vendor/git-for-windows
PATH_SUFFIXES cmd bin
DOC "Git command line client"
)
find_package(Git REQUIRED)
string(REPLACE "mingw64/" "" GIT_EXECUTABLE ${GIT_EXECUTABLE}) # Windows git submodule fix
set(GIT_TOOL_PATH ${GIT_EXECUTABLE} CACHE FILEPATH "The git command line interface" FORCE)
# Find bash itself ...
find_program(BASH_TOOL_PATH bash
HINTS ${GITHUB_BIN_DIR} DOC "The bash executable")
......
### Find Git
# Check for cmder git installed via chocolatey
find_program(GIT_EXECUTABLE
NAMES git
PATHS C:/tools/cmder/vendor/git-for-windows
PATH_SUFFIXES cmd bin
DOC "Git command line client"
)
find_package(Git REQUIRED)
string(REPLACE "mingw64/" "" GIT_EXECUTABLE ${GIT_EXECUTABLE}) # Windows git submodule fix
set(GIT_TOOL_PATH ${GIT_EXECUTABLE} CACHE FILEPATH "The git command line interface" FORCE)
### End Find Git
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment