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

[cmake] Make git optional.

Need to set OGS_VERSION when git is not available.
parent c1289d50
No related branches found
No related tags found
No related merge requests found
......@@ -57,9 +57,13 @@ option(OGS_USE_CVODE "Use the Sundials CVODE module?" OFF)
option(OGS_BUILD_UTILS "Should the utilities programs be built?" ON)
option(OGS_BUILD_TESTING "Should the tests be built?" ON)
if(MSVC)
set(CMD_COMMAND "cmd;/c")
endif()
# ---- CMake includes ----
include(GitSetup)
include(Versions)
include(GitSetup)
include(PythonSetup)
include(ProcessesSetup)
include(ProjectSetup)
......@@ -226,7 +230,7 @@ if(POETRY)
file(STRINGS ${PROJECT_BINARY_DIR}/.python_packages OGS_PYTHON_PACKAGES)
list(REMOVE_DUPLICATES OGS_PYTHON_PACKAGES)
execute_process(
COMMAND ${_CMD_COMMAND} poetry add ${OGS_PYTHON_PACKAGES}
COMMAND ${CMD_COMMAND} poetry add ${OGS_PYTHON_PACKAGES}
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
)
endif()
......
......@@ -3,7 +3,7 @@ if(NOT OGS_USE_CONAN OR NOT OGS_USE_NETCDF)
endif()
string(TOLOWER ${OGS_USE_CONAN} OGS_USE_CONAN_lower)
if(OGS_USE_CONAN_lower STREQUAL "auto" AND POETRY)
execute_process(COMMAND ${_CMD_COMMAND} poetry add conan==${ogs.minimum_version.conan}
execute_process(COMMAND ${CMD_COMMAND} poetry add conan==${ogs.minimum_version.conan}
WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
find_program(CONAN_CMD conan HINTS ${LOCAL_VIRTUALENV_BIN_DIRS}
REQUIRED NO_DEFAULT_PATH
......
......@@ -19,7 +19,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Og")
if(NOT FASTCOV_PATH)
execute_process(
COMMAND ${_CMD_COMMAND} poetry add fastcov==1.10
COMMAND ${CMD_COMMAND} poetry add fastcov==1.10
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
)
find_program(
......
......@@ -2,13 +2,6 @@
# Find tools
# ##############################################################################
string(REPLACE ".windows.1" "" GIT_VERSION_STRING ${GIT_VERSION_STRING})
if(${GIT_VERSION_STRING} VERSION_LESS ${ogs.minimum_version.git})
message(FATAL_ERROR "Git version ${ogs.minimum_version.git} is required. \
Found version ${GIT_VERSION_STRING}."
)
endif()
find_package(Doxygen OPTIONAL_COMPONENTS dot)
if(TARGET Doxygen::dot)
# Create dependency graph in build dir with:
......
# Git detection
find_package(Git REQUIRED)
# cmake-lint: disable=W0106
if(DEFINED ENV{OGS_VERSION})
set(OGS_VERSION $ENV{OGS_VERSION})
message(STATUS "OGS VERSION: ${OGS_VERSION} (set via environment)")
message(STATUS "Using user-provided OGS_VERSION=${OGS_VERSION} (set via environment).")
return()
elseif(DEFINED OGS_VERSION)
message(STATUS "Using user-provided OGS_VERSION=${OGS_VERSION}")
message(STATUS "Using user-provided OGS_VERSION=${OGS_VERSION}.")
return()
endif()
# Git detection
find_package(Git)
if(NOT Git_FOUND)
message(FATAL_ERROR "Git was not found. Either install Git or provide an \
OGS_VERSION as an environment- or CMake-variable!"
)
endif()
string(REPLACE ".windows.1" "" GIT_VERSION_STRING ${GIT_VERSION_STRING})
if(${GIT_VERSION_STRING} VERSION_LESS ${ogs.minimum_version.git})
message(FATAL_ERROR "Git version ${ogs.minimum_version.git} is required. \
Found version ${GIT_VERSION_STRING}."
)
endif()
if(NOT _IS_GIT_REPO)
......@@ -118,7 +131,3 @@ if(_IS_GIT_REPO AND NOT OGS_VERSION)
OUTPUT_STRIP_TRAILING_WHITESPACE
)
endif()
if(MSVC)
set(_CMD_COMMAND "cmd" "/c" CACHE INTERNAL "")
endif()
......@@ -21,7 +21,7 @@ if(OGS_USE_POETRY)
endif()
if(NOT EXISTS ${PROJECT_BINARY_DIR}/.venv)
execute_process(
COMMAND ${_CMD_COMMAND} poetry install
COMMAND ${CMD_COMMAND} poetry install
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
)
endif()
......
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