From 3b178b39c3ce3aea49fd18b0f9d9fbf81b8b668a Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 8 Oct 2020 08:25:03 +0200
Subject: [PATCH] [CMake] Fix include order for correct submodule setup.
---
CMakeLists.txt | 4 ++--
scripts/cmake/GitSetup.cmake | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d305b072d6..d79a3855295 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,10 +61,10 @@ endif()
option(OGS_USE_CVODE "Use the Sundials CVODE module?" OFF)
# ---- CMake includes ----
-include(Versions)
include(GitSetup)
-include(PythonSetup)
include(SubmoduleSetup)
+include(Versions)
+include(PythonSetup)
include(ProcessesSetup)
include(ProjectSetup)
include(Functions)
diff --git a/scripts/cmake/GitSetup.cmake b/scripts/cmake/GitSetup.cmake
index 6ec1497b2ab..e2c844d59ee 100644
--- a/scripts/cmake/GitSetup.cmake
+++ b/scripts/cmake/GitSetup.cmake
@@ -6,7 +6,7 @@ if(DEFINED ENV{OGS_VERSION})
message(STATUS "OGS VERSION: ${OGS_VERSION} (set via environment)")
endif()
-if(NOT IS_GIT_REPO AND NOT OGS_VERSION)
+if(NOT IS_GIT_REPO)
execute_process(COMMAND ${GIT_EXECUTABLE} status
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
RESULT_VARIABLE IS_GIT_REPO
--
GitLab