Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

remove spdlog submodule and use system version instead

Browse source
This commit is contained in:
Steffen Vogel 2019-09-03 21:32:44 +02:00
parent 4b54fec2ab
commit 1f85a811fc
7 changed files with 2 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/.gitmodules vendored
View file

@ -1,6 +0,0 @@
[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

3
common/CMakeLists.txt
View file

@ -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)

2
common/include/villas/log.hpp
View file

@ -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>

3
common/lib/CMakeLists.txt
View file

@ -73,8 +73,7 @@ target_link_libraries(villas-common PUBLIC
${OPENSSL_LIBRARIES}
${CURL_LIBRARIES}
${CMAKE_DL_LIBS}
spdlog
fmt
spdlog::spdlog
stdc++
)

14
common/thirdparty/CMakeLists.txt vendored
View file

@ -1,14 +0,0 @@
# 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)

1
common/thirdparty/fmtlib vendored

@ -1 +0,0 @@
Subproject commit c2ce7e4f07f7b34b2c7bbd0a4d0798b1d7007f4f

1
common/thirdparty/spdlog vendored

@ -1 +0,0 @@
Subproject commit b6b9d835c588c35227410a9830e7a4586f90777a