diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 2082f9d..d075dd1 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -1,23 +1,22 @@ find_package(nng QUIET) - if(NOT nng) - message("-- Using nng from external/nng") + message(STATUS "${CMAKE_PROJECT_NAME}: Using nng from ${CMAKE_CURRENT_SOURCE_DIR}/nng") option(NNG_SETSTACKSIZE "Use rlimit for thread stack size" ON) set(NNG_TESTS OFF) set(NNG_ENABLE_NNGCAT ON) add_subdirectory(nng) endif() -find_package(mesytec-mvlc QUIET) +if (NOT TARGET spdlog) + message(STATUS "${CMAKE_PROJECT_NAME}: Using spdlog from ${CMAKE_CURRENT_SOURCE_DIR}/spdlog") + option(SPDLOG_FMT_EXTERNAL "Use external fmt library instead of bundled" OFF) + option(SPDLOG_INSTALL "Generate the install target" OFF) + add_subdirectory(spdlog-1.14.0) + set_target_properties(spdlog PROPERTIES POSITION_INDEPENDENT_CODE ON) +endif() +find_package(mesytec-mvlc QUIET) if (NOT mesytec-mvlc) - message("-- Using mesytec-mvlc from external/mesytec-mvlc") + message(STATUS "${CMAKE_PROJECT_NAME}: Using mesytec-mvlc from ${CMAKE_CURRENT_SOURCE_DIR}/mesytec-mvlc") add_subdirectory(mesytec-mvlc) endif() - -find_package(spdlog QUIET) - -if (NOT TARGET spdlog) - message("-- Using spdlog from external/spdlog") - add_subdirectory(spdlog) -endif() diff --git a/external/mesytec-mvlc b/external/mesytec-mvlc index 1c1f32d..5888edb 160000 --- a/external/mesytec-mvlc +++ b/external/mesytec-mvlc @@ -1 +1 @@ -Subproject commit 1c1f32dbc587747219a942aabe2a2668fab1ae82 +Subproject commit 5888edb2bdc10167e71e1f5e4d39bb342e2cf552 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 33a855d..9bc03c2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -set(MVLC_NNG_MNODE_WARN_FLAGS -Wall -Wextra -Wpedantic -Werror=return-type) +set(MVLC_NNG_MNODE_WARN_FLAGS -Wall -Werror=return-type) add_library(mesytec-mnode-nng mnode_nng.cc) target_include_directories(mesytec-mnode-nng