From d676b2dff6ab52469bbec13ae026a57bc2f817d3 Mon Sep 17 00:00:00 2001 From: rex-schilasky <49162693+rex-schilasky@users.noreply.github.com> Date: Mon, 21 Oct 2024 13:52:24 +0200 Subject: [PATCH] cmake options --- .../ecal_registration_receiver.cpp | 6 ++++- .../registration_test_public/CMakeLists.txt | 24 ++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ecal/core/src/registration/ecal_registration_receiver.cpp b/ecal/core/src/registration/ecal_registration_receiver.cpp index 2a68865..d4d8fee 100644 --- a/ecal/core/src/registration/ecal_registration_receiver.cpp +++ b/ecal/core/src/registration/ecal_registration_receiver.cpp @@ -55,8 +55,12 @@ namespace eCAL CRegistrationReceiver::CRegistrationReceiver(const Registration::SAttributes& attr_) : m_timeout_provider(nullptr) , m_timeout_provider_thread(nullptr) +#if ECAL_CORE_TRANSPORT_UDP , m_registration_receiver_udp(nullptr) - , m_registration_receiver_shm(nullptr) +#endif +#if ECAL_CORE_REGISTRATION_SHM + , m_registration_receiver_shm(nullptr) +#endif , m_sample_applier(Registration::SampleApplier::BuildSampleApplierAttributes(attr_)) , m_attributes(attr_) { diff --git a/ecal/tests/cpp/registration_test_public/CMakeLists.txt b/ecal/tests/cpp/registration_test_public/CMakeLists.txt index 9605dc3..5a3aa4a 100644 --- a/ecal/tests/cpp/registration_test_public/CMakeLists.txt +++ b/ecal/tests/cpp/registration_test_public/CMakeLists.txt @@ -21,20 +21,16 @@ project(test_registration_public) find_package(Threads REQUIRED) find_package(GTest REQUIRED) -if(ECAL_CORE_PUBLISHER AND ECAL_CORE_SUBSCRIBER) - set(registration_test_topics_src - src/registration_getpublisherids.cpp - src/registration_getsubscriberids.cpp - src/registration_gettopics.cpp - ) -endif() - -if(ECAL_CORE_SERVICE) - set(registration_test_service_src - src/registration_getclients.cpp - src/registration_getservices.cpp - ) -endif() +set(registration_test_topics_src + src/registration_getpublisherids.cpp + src/registration_getsubscriberids.cpp + src/registration_gettopics.cpp +) + +set(registration_test_service_src + src/registration_getclients.cpp + src/registration_getservices.cpp +) set(registration_test_src ${registration_test_topics_src}