From 43c18dc243777dff76b567b71a56023b8a2ccd62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20L=C3=BCke?= Date: Sat, 7 Dec 2024 21:54:46 +0100 Subject: [PATCH] cleanup --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 14 -------------- src/internal/argh.h | 2 +- src/mesy_nng_push_pull_main.cc | 1 - 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4263f22..548dc24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(Protobuf REQUIRED) add_library(mnode-proto proto/service.proto) target_link_libraries(mnode-proto PUBLIC protobuf::libprotobuf) -target_include_directories(mnode-proto PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(mnode-proto PUBLIC $) protobuf_generate(TARGET mnode-proto) protobuf_generate_python(PROTO_PY proto/service.proto) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d6bb87b..2040594 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,25 +1,11 @@ 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) #if (CLANG_TIDY_EXECUTABLE) # 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) #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) target_include_directories(mesytec-mnode PUBLIC $ diff --git a/src/internal/argh.h b/src/internal/argh.h index 1af8503..0b3d04c 100644 --- a/src/internal/argh.h +++ b/src/internal/argh.h @@ -157,7 +157,7 @@ public: std::string getName() { return name; } std::string getMessage() { return msg; } void setParsed(bool parsed) { Option::setParsed(parsed); flag = parsed; } - void setValue(std::string const& val) {} + void setValue(std::string const&) {} protected: bool& flag; diff --git a/src/mesy_nng_push_pull_main.cc b/src/mesy_nng_push_pull_main.cc index 7e6b431..ede622a 100644 --- a/src/mesy_nng_push_pull_main.cc +++ b/src/mesy_nng_push_pull_main.cc @@ -4,7 +4,6 @@ #include #include "test_producer_consumer.h" -#include #include using namespace mesytec::mnode::nng;