From fafeb10bb1fc2f44d80765ec7eea5239ebc0a7e9 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 28 Nov 2012 11:38:37 +0100
Subject: [PATCH] Fixed submodule setup on Windows.
---
CMakeLists.txt | 2 +-
scripts/cmake/Find.cmake | 2 ++
scripts/cmake/SubmoduleSetup.cmake | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3cd4d839d05..99768353801 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index 1dd0fc16339..b93a3fd530a 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.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")
diff --git a/scripts/cmake/SubmoduleSetup.cmake b/scripts/cmake/SubmoduleSetup.cmake
index 06d8946c0f0..42940d64c7e 100644
--- a/scripts/cmake/SubmoduleSetup.cmake
+++ b/scripts/cmake/SubmoduleSetup.cmake
@@ -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()
--
GitLab