Merge pull request #2032

dd8e3266 shared libs build (i.e. make debug) (stoffu)
2017-05-30 21:21:36 +02:00 · 2017-05-30 21:21:36 +02:00 · 9ea7fbed8a
parent 907ce14b18 dd8e3266b2
commit 9ea7fbed8a
3 changed files with 3 additions and 2 deletions
--- 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
--- 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"

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