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

Fixed submodule setup on Windows.

parent e74b9c24
No related branches found
No related tags found
No related merge requests found
......@@ -25,10 +25,10 @@ INCLUDE(scripts/cmake/FindIncludeHeader.cmake)
INCLUDE(scripts/cmake/Functions.cmake)
INCLUDE(scripts/cmake/CMakeSetup.cmake)
INCLUDE(scripts/cmake/CompilerSetup.cmake)
INCLUDE(scripts/cmake/SubmoduleSetup.cmake)
IF(NOT OGS_NO_EXTERNAL_LIBS)
INCLUDE(scripts/cmake/Find.cmake)
ENDIF() # NOT OGS_NO_EXTERNAL_LIBS
INCLUDE(scripts/cmake/SubmoduleSetup.cmake)
INCLUDE(scripts/cmake/ProjectSetup.cmake)
INCLUDE(scripts/cmake/DocumentationSetup.cmake)
INCLUDE(scripts/cmake/Test.cmake)
......
......@@ -29,6 +29,8 @@ FIND_PACKAGE(PythonInterp)
FIND_PACKAGE(GitHub)
FIND_PROGRAM(GIT_TOOL_PATH git HINTS ${GITHUB_BIN_DIR} DOC "The git command line interface")
# Find bash itself ...
FIND_PROGRAM(BASH_TOOL_PATH bash
HINTS ${GITHUB_BIN_DIR} DOC "The bash executable")
......
......@@ -16,7 +16,7 @@ FOREACH(SUBMODULE ${REQUIRED_SUBMODULES})
IF(SUBMODULE_IS_NOT_INITIALIZED)
MESSAGE(STATUS "Initializing submodule ${SUBMODULE}")
EXECUTE_PROCESS(
COMMAND git submodule update --init ${SUBMODULE}
COMMAND ${GIT_TOOL_PATH} submodule update --init ${SUBMODULE}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)
ENDIF()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment