Added functionality for automatically initializing git submodules.

See scripts/cmake/SubmoduleSetup.cmake for details.

CMakeLists.txt

@@ -25,6 +25,7 @@ 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

GeoLib/CMakeLists.txt

@@ -7,8 +7,8 @@ ADD_LIBRARY(GeoLib STATIC ${SOURCES_GeoLib})
 
 include_directories(
 	.
-	../BaseLib
-	../MathLib
+	${CMAKE_SOURCE_DIR}/BaseLib
+	${CMAKE_SOURCE_DIR}/MathLib
 )
 
 

scripts/cmake/SubmoduleCheck.sh

+# Checks for unitialized git submodules
+# Parameter 1: The path to the submodule
+# Returns 0 if there is no such submodule
+# Returns 1 if the module is already initialized
+result=$(git submodule status $1 | grep '^-' | wc -l); exit $result
\ No newline at end of file

scripts/cmake/SubmoduleSetup.cmake

+# This file initializes the required submodules
+
+SET(REQUIRED_SUBMODULES
+	Tests/quickcheck
+)
+
+FOREACH(SUBMODULE ${REQUIRED_SUBMODULES})
+	# Check if submodule is already initialized
+	# MESSAGE(STATUS "Checking module ${SUBMODULE}")
+	EXECUTE_PROCESS(
+		COMMAND bash ${CMAKE_SOURCE_DIR}/scripts/cmake/SubmoduleCheck.sh ${SUBMODULE}
+		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+		RESULT_VARIABLE SUBMODULE_IS_NOT_INITIALIZED
+	)
+
+	IF(SUBMODULE_IS_NOT_INITIALIZED)
+		MESSAGE(STATUS "Initializing submodule ${SUBMODULE}")
+		EXECUTE_PROCESS(
+			COMMAND git submodule update --init ${SUBMODULE}
+			WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+		)
+	ENDIF()
+ENDFOREACH()
\ No newline at end of file