diff options
| author | Saturneric <[email protected]> | 2023-02-03 06:29:04 +0000 |
|---|---|---|
| committer | Saturneric <[email protected]> | 2023-02-03 06:29:04 +0000 |
| commit | d0fe4b6a4f964553e7f1b33aaeaf19e68ba3bc73 (patch) | |
| tree | 5e3af6b212d44722cd1d1d5b8560d5eb5237b528 | |
| parent | feat: update submodules (diff) | |
| download | GpgFrontend-d0fe4b6a4f964553e7f1b33aaeaf19e68ba3bc73.tar.gz GpgFrontend-d0fe4b6a4f964553e7f1b33aaeaf19e68ba3bc73.zip | |
feat: change logging framework to spdlog
| -rw-r--r-- | src/GpgFrontend.h.in | 4 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | third_party/CMakeLists.txt | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/src/GpgFrontend.h.in b/src/GpgFrontend.h.in index 78ab6e6a..2ef8ddc2 100644 --- a/src/GpgFrontend.h.in +++ b/src/GpgFrontend.h.in @@ -57,9 +57,7 @@ // logging system -#define ELPP_DEFAULT_LOGGING_FLAGS 8192 -#include <easylogging++.h> - +#include <spdlog/spdlog.h> // build info #define PROJECT_NAME "@CMAKE_PROJECT_NAME@" diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 0282b58c..68a2f53f 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -46,11 +46,6 @@ if (NOT LINUX) target_link_libraries(gpgfrontend_core PUBLIC config++ intl) endif () -# easyloggingpp -target_include_directories(gpgfrontend_core PUBLIC - ${CMAKE_SOURCE_DIR}/third_party/easyloggingpp/src) -target_sources(gpgfrontend_core PUBLIC - ${CMAKE_SOURCE_DIR}/third_party/easyloggingpp/src/easylogging++.cc) # qt-aes target_sources(gpgfrontend_core PRIVATE ${CMAKE_SOURCE_DIR}/third_party/qt-aes/qaesencryption.cpp) @@ -82,6 +77,9 @@ if (MINGW) target_link_libraries(gpgfrontend_core PUBLIC bcrypt) endif () +# spdlog +target_link_libraries(gpgfrontend_core PRIVATE spdlog) + # link libarchive target_link_libraries(gpgfrontend_core PRIVATE archive) diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index 04068ca1..c7912e31 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -26,4 +26,6 @@ # json set(JSON_BuildTests OFF CACHE INTERNAL "") -add_subdirectory(json EXCLUDE_FROM_ALL)
\ No newline at end of file +add_subdirectory(json EXCLUDE_FROM_ALL) + +add_subdirectory(spdlog EXCLUDE_FROM_ALL)
\ No newline at end of file |