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

Replaced spdlog submodule with CPM.

parent 8ce92b13
No related branches found
No related tags found
No related merge requests found
......@@ -34,9 +34,6 @@
[submodule "ThirdParty/json-cmake"]
path = ThirdParty/json-cmake
url = https://github.com/ufz/json-cmake.git
[submodule "ThirdParty/spdlog"]
path = ThirdParty/spdlog
url = https://github.com/gabime/spdlog.git
[submodule "ThirdParty/xdmf"]
path = ThirdParty/xdmf
url = https://gitlab.opengeosys.org/ogs/xdmflib.git
......@@ -225,7 +225,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty
${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/tclap/include
${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/json/include
${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/spdlog/include)
)
# vtkdiff
if(BUILD_TESTING)
......
add_subdirectory(spdlog)
set(DISABLE_WARNINGS_TARGETS spdlog)
# This is a workaround for Travis builds.
option(OGS_USE_OPTIONAL_SUBMODULES "Option for enabling optional submodules" OFF)
......
Subproject commit de0dbfa3596a18cd70a4619b6a9766847a941276
......@@ -32,6 +32,13 @@ if(exprtk_ADDED)
target_include_directories(exprtk INTERFACE ${exprtk_SOURCE_DIR})
endif()
CPMAddPackage(
NAME spdlog
GITHUB_REPOSITORY gabime/spdlog
VERSION 1.8.2
# DOWNLOAD_ONLY YES
)
######################
### Find tools ###
######################
......
......@@ -12,7 +12,6 @@ set(REQUIRED_SUBMODULES
ThirdParty/cmake-modules
ThirdParty/iphreeqc/src
ThirdParty/json-cmake
ThirdParty/spdlog
ThirdParty/tclap
ThirdParty/tetgen
${OGS_ADDITIONAL_SUBMODULES_TO_CHECKOUT}
......
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