diff options
| author | Marcus Müller <mmueller@gnuradio.org> | 2021-08-03 13:05:37 +0200 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-11-19 14:00:08 -0500 |
| commit | 1bb08e8004aa8ba6637db3f06abdc283ea56c18a (patch) | |
| tree | 39140de01d77dee6999f85e90d9fa9dc7cf8471f /cmake | |
| parent | cb60862fd493a0141946ff9dddc5a98c9c67690b (diff) | |
logging core: replace log4cpp by spdlog
also: enable formerly disabled qa_logger tests
This replaces log4cpp with spdlog.
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindLOG4CPP.cmake | 62 | ||||
| -rw-r--r-- | cmake/Modules/GnuradioConfig.cmake.in | 2 |
2 files changed, 1 insertions, 63 deletions
diff --git a/cmake/Modules/FindLOG4CPP.cmake b/cmake/Modules/FindLOG4CPP.cmake deleted file mode 100644 index 61d58134a0..0000000000 --- a/cmake/Modules/FindLOG4CPP.cmake +++ /dev/null @@ -1,62 +0,0 @@ -# - Find Log4cpp -# Find the native LOG4CPP includes and library -# -# LOG4CPP_INCLUDE_DIR - where to find LOG4CPP.h, etc. -# LOG4CPP_LIBRARIES - List of libraries when using LOG4CPP. -# LOG4CPP_FOUND - True if LOG4CPP found. - - -if (LOG4CPP_INCLUDE_DIR) - # Already in cache, be silent - set(LOG4CPP_FIND_QUIETLY TRUE) -endif () - -find_path(LOG4CPP_INCLUDE_DIR log4cpp/Category.hh - /usr/include - /usr/local/include - /opt/local/include -) - -set(LOG4CPP_NAMES log4cpp) -find_library(LOG4CPP_LIBRARY - NAMES ${LOG4CPP_NAMES} - PATHS /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64 /opt/local/lib /opt/local/lib64 -) - - -if (LOG4CPP_INCLUDE_DIR AND LOG4CPP_LIBRARY) - set(LOG4CPP_FOUND TRUE) - set(LOG4CPP_LIBRARIES ${LOG4CPP_LIBRARY} CACHE INTERNAL "" FORCE) - set(LOG4CPP_INCLUDE_DIRS ${LOG4CPP_INCLUDE_DIR} CACHE INTERNAL "" FORCE) -else () - set(LOG4CPP_FOUND FALSE CACHE INTERNAL "" FORCE) - set(LOG4CPP_LIBRARY "" CACHE INTERNAL "" FORCE) - set(LOG4CPP_LIBRARIES "" CACHE INTERNAL "" FORCE) - set(LOG4CPP_INCLUDE_DIR "" CACHE INTERNAL "" FORCE) - set(LOG4CPP_INCLUDE_DIRS "" CACHE INTERNAL "" FORCE) -endif () - -if (LOG4CPP_FOUND) - if (NOT LOG4CPP_FIND_QUIETLY) - message(STATUS "Found LOG4CPP: ${LOG4CPP_LIBRARIES}") - endif () -else () - if (LOG4CPP_FIND_REQUIRED) - message(STATUS "Looked for LOG4CPP libraries named ${LOG4CPP_NAMES}.") - message(FATAL_ERROR "Could NOT find LOG4CPP library") - endif () -endif () - - -if (LOG4CPP_FOUND AND NOT TARGET Log4Cpp::log4cpp) - add_library(Log4Cpp::log4cpp INTERFACE IMPORTED) - set_target_properties(Log4Cpp::log4cpp PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${LOG4CPP_INCLUDE_DIRS}" - INTERFACE_LINK_LIBRARIES "${LOG4CPP_LIBRARIES}" - ) -endif() - -mark_as_advanced( - LOG4CPP_LIBRARIES - LOG4CPP_INCLUDE_DIRS -) diff --git a/cmake/Modules/GnuradioConfig.cmake.in b/cmake/Modules/GnuradioConfig.cmake.in index afd7790ef1..04cb5e350f 100644 --- a/cmake/Modules/GnuradioConfig.cmake.in +++ b/cmake/Modules/GnuradioConfig.cmake.in @@ -10,7 +10,7 @@ include(CMakeFindDependencyMacro) # Allows us to use all .cmake files in this directory list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_LIST_DIR}") -find_dependency(LOG4CPP) +find_dependency(spdlog) find_dependency(MPLIB) set(BOOST_REQUIRED_COMPONENTS |