diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-05-30 21:21:36 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-05-30 21:21:36 +0200 |
| commit | 9ea7fbed8a5631f60a6cb561ec64dbf3d6c58024 (patch) | |
| tree | d2c3517539166ccfef9f709bf5c0f7ceb9415204 | |
| parent | Merge pull request #2026 (diff) | |
| parent | shared libs build (i.e. make debug) (diff) | |
| download | monero-9ea7fbed8a5631f60a6cb561ec64dbf3d6c58024.tar.xz | |
Merge pull request #2032
dd8e3266 shared libs build (i.e. make debug) (stoffu)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | contrib/epee/src/mlog.cpp | 2 | ||||
| -rw-r--r-- | src/mnemonics/CMakeLists.txt | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d584e41c0..a9d6be986 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -338,6 +338,8 @@ if (UNIX AND NOT APPLE) find_package(Threads) endif() +add_definitions(-DAUTO_INITIALIZE_EASYLOGGINGPP) + add_subdirectory(external) # Final setup for miniupnpc diff --git a/contrib/epee/src/mlog.cpp b/contrib/epee/src/mlog.cpp index 7487fdbd2..3be992374 100644 --- a/contrib/epee/src/mlog.cpp +++ b/contrib/epee/src/mlog.cpp @@ -31,8 +31,6 @@ #include <atomic> #include "misc_log_ex.h" -INITIALIZE_EASYLOGGINGPP - #undef MONERO_DEFAULT_LOG_CATEGORY #define MONERO_DEFAULT_LOG_CATEGORY "logging" diff --git a/src/mnemonics/CMakeLists.txt b/src/mnemonics/CMakeLists.txt index c521a0932..269cfe846 100644 --- a/src/mnemonics/CMakeLists.txt +++ b/src/mnemonics/CMakeLists.txt @@ -55,6 +55,7 @@ monero_add_library(mnemonics ${mnemonics_private_headers}) target_link_libraries(mnemonics PUBLIC + easylogging ${Boost_SYSTEM_LIBRARY} PRIVATE ${EXTRA_LIBRARIES}) |