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

cleanup

Browse source
This commit is contained in:
Florian Lüke 2024-12-07 21:54:46 +01:00
parent fea9cd07b1
commit 43c18dc243
4 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -18,7 +18,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(Protobuf REQUIRED) find_package(Protobuf REQUIRED)
add_library(mnode-proto proto/service.proto) add_library(mnode-proto proto/service.proto)
target_link_libraries(mnode-proto PUBLIC protobuf::libprotobuf) target_link_libraries(mnode-proto PUBLIC protobuf::libprotobuf)
target_include_directories(mnode-proto PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories(mnode-proto PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
protobuf_generate(TARGET mnode-proto) protobuf_generate(TARGET mnode-proto)
protobuf_generate_python(PROTO_PY proto/service.proto) protobuf_generate_python(PROTO_PY proto/service.proto)

14
src/CMakeLists.txt
View file

@ -1,25 +1,11 @@
set(MVLC_NNG_MNODE_WARN_FLAGS -Wall -Wextra -Wpedantic) set(MVLC_NNG_MNODE_WARN_FLAGS -Wall -Wextra -Wpedantic)
# Bit of a hack to set the variables here. If set earlier clang-tidy will for
# some reason pickup log.c and warn about some va_list stuff. Might be because
# log.c is in the source directory as the same does not happen with the imgui
# object library. TODO: move logc to externals.
#find_program(CLANG_TIDY_EXECUTABLE clang-tidy) #find_program(CLANG_TIDY_EXECUTABLE clang-tidy)
#if (CLANG_TIDY_EXECUTABLE) #if (CLANG_TIDY_EXECUTABLE)
# set(CMAKE_C_CLANG_TIDY clang-tidy -p ${CMAKE_BINARY_DIR} --extra-arg=-std=c11) # set(CMAKE_C_CLANG_TIDY clang-tidy -p ${CMAKE_BINARY_DIR} --extra-arg=-std=c11)
# set(CMAKE_CXX_CLANG_TIDY clang-tidy -p ${CMAKE_BINARY_DIR} --extra-arg=-std=c++17) # set(CMAKE_CXX_CLANG_TIDY clang-tidy -p ${CMAKE_BINARY_DIR} --extra-arg=-std=c++17)
#endif() #endif()
#add_library(dp_common dp_common.c)
#target_compile_features(dp_common PRIVATE c_std_11)
#target_compile_options(dp_common PUBLIC ${DP_WARN_FLAGS}) # spread warning flags
#target_link_libraries(dp_common
# PUBLIC logc
# PUBLIC nng
# PUBLIC Threads::Threads
#)
#target_include_directories(dp_common INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
add_library(mesytec-mnode mnode_nng.cc mnode_nng_async.cc) add_library(mesytec-mnode mnode_nng.cc mnode_nng_async.cc)
target_include_directories(mesytec-mnode target_include_directories(mesytec-mnode
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include> PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>

2
src/internal/argh.h
View file

@ -157,7 +157,7 @@ public:
std::string getName() { return name; } std::string getName() { return name; }
std::string getMessage() { return msg; } std::string getMessage() { return msg; }
void setParsed(bool parsed) { Option::setParsed(parsed); flag = parsed; } void setParsed(bool parsed) { Option::setParsed(parsed); flag = parsed; }
void setValue(std::string const& val) {} void setValue(std::string const&) {}
protected: protected:
bool& flag; bool& flag;

1
src/mesy_nng_push_pull_main.cc
View file

@ -4,7 +4,6 @@
#include <thread> #include <thread>
#include "test_producer_consumer.h" #include "test_producer_consumer.h"
#include <mesytec-mnode/mnode_nng.h>
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>
using namespace mesytec::mnode::nng; using namespace mesytec::mnode::nng;