Aufgrund eines Versionsupdates wird GitLab am 01.04. zwischen 9:00 und 9:30 Uhr kurzzeitig nicht zur Verfügung stehen. / Due to a version upgrade, GitLab won't be accessible at 01.04. between 9:00 and 9:30 a.m.

Commit 73325386 authored by Steffen Vogel's avatar Steffen Vogel 🎅🏼

remove spdlog submodule and use system version instead

parent bf060238
[submodule "thirdparty/spdlog"]
path = thirdparty/spdlog
url = https://github.com/gabime/spdlog.git
[submodule "thirdparty/fmtlib"]
path = thirdparty/fmtlib
url = https://github.com/fmtlib/fmt.git
......@@ -56,8 +56,7 @@ endif()
find_package(OpenSSL 1.0.0 REQUIRED)
find_package(CURL 7.29 REQUIRED)
find_package(Criterion)
add_subdirectory(thirdparty)
find_package(spdlog REQUIRED)
pkg_check_modules(JANSSON IMPORTED_TARGET REQUIRED jansson>=2.7)
pkg_check_modules(LIBCONFIG IMPORTED_TARGET libconfig>=1.4.9)
......
......@@ -26,8 +26,6 @@
#include <string>
#define SPDLOG_FMT_EXTERNAL
#include <spdlog/spdlog.h>
#include <spdlog/sinks/dist_sink.h>
#include <spdlog/sinks/stdout_color_sinks.h>
......
......@@ -73,8 +73,7 @@ target_link_libraries(villas-common PUBLIC
${OPENSSL_LIBRARIES}
${CURL_LIBRARIES}
${CMAKE_DL_LIBS}
spdlog
fmt
spdlog::spdlog
stdc++
)
......
# We dont want to install the spdlog headers
#set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL ON)
set(SPDLOG_BUILD_EXAMPLES OFF CACHE BOOL "Build examples" FORCE)
set(SPDLOG_BUILD_TESTING OFF CACHE BOOL "Build spdlog tests" FORCE)
set(SPDLOG_BUILD_BENCH OFF CACHE BOOL "Build spdlog benchmarks" FORCE)
add_subdirectory(spdlog)
set(FMT_DOC OFF CACHE BOOL "Generate the doc target." FORCE)
set(FMT_INSTALL OFF CACHE BOOL "Generate the install target." FORCE)
set(FMT_TEST OFF CACHE BOOL "Generate the test target." FORCE)
add_subdirectory(fmtlib)
target_compile_options(fmt PUBLIC -fPIC)
Subproject commit c2ce7e4f07f7b34b2c7bbd0a4d0798b1d7007f4f
Subproject commit b6b9d835c588c35227410a9830e7a4586f90777a
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment