From 0dbfb861e56013e509f6865ddb6f05cc486ec8b7 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 7 Jun 2017 08:20:31 +0200
Subject: [PATCH] [CMake] Run git submodule sync in CMake.
This fixes submodule checkout errors when the submodules URL changed.
Fixed also a CMake error when CVODE_KLU variable was not defined.
---
ThirdParty/cmake-modules | 2 +-
scripts/cmake/SubmoduleSetup.cmake | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/ThirdParty/cmake-modules b/ThirdParty/cmake-modules
index af334f92548..8382e36c3a2 160000
--- a/ThirdParty/cmake-modules
+++ b/ThirdParty/cmake-modules
@@ -1 +1 @@
-Subproject commit af334f92548b7349a1bb038d56ce91fc7b3d3d00
+Subproject commit 8382e36c3a2916bb3de96fb5b91365246e2b22a7
diff --git a/scripts/cmake/SubmoduleSetup.cmake b/scripts/cmake/SubmoduleSetup.cmake
index 8f0fab35f78..bc28837cf3c 100644
--- a/scripts/cmake/SubmoduleSetup.cmake
+++ b/scripts/cmake/SubmoduleSetup.cmake
@@ -25,6 +25,13 @@ if(OGS_BUILD_SWMM)
list(APPEND REQUIRED_SUBMODULES ThirdParty/SwmmInterface)
endif()
+# Sync submodules, which is required when a submodule changed its URL
+execute_process(
+ COMMAND ${GIT_TOOL_PATH} submodule sync
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ OUTPUT_QUIET
+)
+
foreach(SUBMODULE ${REQUIRED_SUBMODULES})
execute_process(
COMMAND ${GIT_TOOL_PATH} submodule status ${SUBMODULE}
--
GitLab