florian/mesytec-mnode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update mesytec-mvlc, cmake fixes

Browse source
This commit is contained in:
Florian Lüke 2024-12-28 17:54:15 +01:00
parent ef407db7f1
commit 80ab196d90
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
external/CMakeLists.txt vendored
View file

@ -1,23 +1,22 @@
find_package(nng QUIET) find_package(nng QUIET)
if(NOT nng) 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) option(NNG_SETSTACKSIZE "Use rlimit for thread stack size" ON)
set(NNG_TESTS OFF) set(NNG_TESTS OFF)
set(NNG_ENABLE_NNGCAT ON) set(NNG_ENABLE_NNGCAT ON)
add_subdirectory(nng) add_subdirectory(nng)
endif() 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) 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) add_subdirectory(mesytec-mvlc)
endif() endif()
find_package(spdlog QUIET)
if (NOT TARGET spdlog)
message("-- Using spdlog from external/spdlog")
add_subdirectory(spdlog)
endif()

2
external/mesytec-mvlc vendored

@ -1 +1 @@
Subproject commit 1c1f32dbc587747219a942aabe2a2668fab1ae82 Subproject commit 5888edb2bdc10167e71e1f5e4d39bb342e2cf552

2
src/CMakeLists.txt
View file

@ -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) add_library(mesytec-mnode-nng mnode_nng.cc)
target_include_directories(mesytec-mnode-nng target_include_directories(mesytec-mnode-nng