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

[CMake] Fix include order for correct submodule setup.

parent f76515a4
No related branches found
No related tags found
No related merge requests found
...@@ -61,10 +61,10 @@ endif() ...@@ -61,10 +61,10 @@ endif()
option(OGS_USE_CVODE "Use the Sundials CVODE module?" OFF) option(OGS_USE_CVODE "Use the Sundials CVODE module?" OFF)
# ---- CMake includes ---- # ---- CMake includes ----
include(Versions)
include(GitSetup) include(GitSetup)
include(PythonSetup)
include(SubmoduleSetup) include(SubmoduleSetup)
include(Versions)
include(PythonSetup)
include(ProcessesSetup) include(ProcessesSetup)
include(ProjectSetup) include(ProjectSetup)
include(Functions) include(Functions)
......
...@@ -6,7 +6,7 @@ if(DEFINED ENV{OGS_VERSION}) ...@@ -6,7 +6,7 @@ if(DEFINED ENV{OGS_VERSION})
message(STATUS "OGS VERSION: ${OGS_VERSION} (set via environment)") message(STATUS "OGS VERSION: ${OGS_VERSION} (set via environment)")
endif() endif()
if(NOT IS_GIT_REPO AND NOT OGS_VERSION) if(NOT IS_GIT_REPO)
execute_process(COMMAND ${GIT_EXECUTABLE} status execute_process(COMMAND ${GIT_EXECUTABLE} status
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
RESULT_VARIABLE IS_GIT_REPO RESULT_VARIABLE IS_GIT_REPO
......
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