From 5dad50953214f27c335d704d0c32f7f9a81e4a8b Mon Sep 17 00:00:00 2001 From: rex-schilasky <49162693+rex-schilasky@users.noreply.github.com> Date: Mon, 21 Oct 2024 14:21:25 +0200 Subject: [PATCH] monitoring_only removed --- .github/workflows/build-macos.yml | 22 ----------------- .github/workflows/build-ubuntu.yml | 22 ----------------- .github/workflows/build-windows.yml | 21 ---------------- .../registration_test_public/CMakeLists.txt | 24 +++++++++++-------- 4 files changed, 14 insertions(+), 75 deletions(-) diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index e39bac5..7e0ca6f 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -212,28 +212,6 @@ jobs: ECAL_THIRDPARTY_BUILD_PROTOBUF: "OFF" BUILD_SHARED_LIBS: "OFF" CMAKE_BUILD_TYPE: "Release" - ######################################## - - name: "monitoring_only" - ######################################## - ECAL_CORE_HAS_PROTOBUF: "ON" - ECAL_CORE_BUILD_SAMPLES: "ON" - ECAL_CORE_BUILD_TESTS: "ON" - ECAL_CORE_CONFIGURATION: "OFF" - ECAL_CORE_COMMAND_LINE: "OFF" - ECAL_CORE_REGISTRATION: "ON" - ECAL_CORE_REGISTRATION_SHM: "OFF" - ECAL_CORE_MONITORING: "ON" - ECAL_CORE_PUBLISHER: "OFF" - ECAL_CORE_SUBSCRIBER: "OFF" - ECAL_CORE_SERVICE: "OFF" - ECAL_CORE_TIMEPLUGIN: "OFF" - ECAL_CORE_TRANSPORT_UDP: "OFF" - ECAL_CORE_TRANSPORT_TCP: "OFF" - ECAL_CORE_TRANSPORT_SHM: "OFF" - ECAL_CORE_NPCAP_SUPPORT: "OFF" - ECAL_THIRDPARTY_BUILD_PROTOBUF: "OFF" - BUILD_SHARED_LIBS: "OFF" - CMAKE_BUILD_TYPE: "Release" steps: - name: Install Dependencies diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index 7ee9e5c..fa15cdb 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -212,28 +212,6 @@ jobs: ECAL_THIRDPARTY_BUILD_PROTOBUF: "OFF" BUILD_SHARED_LIBS: "OFF" CMAKE_BUILD_TYPE: "Release" - ######################################## - - name: "monitoring_only" - ######################################## - ECAL_CORE_HAS_PROTOBUF: "ON" - ECAL_CORE_BUILD_SAMPLES: "ON" - ECAL_CORE_BUILD_TESTS: "ON" - ECAL_CORE_CONFIGURATION: "OFF" - ECAL_CORE_COMMAND_LINE: "OFF" - ECAL_CORE_REGISTRATION: "ON" - ECAL_CORE_REGISTRATION_SHM: "OFF" - ECAL_CORE_MONITORING: "ON" - ECAL_CORE_PUBLISHER: "OFF" - ECAL_CORE_SUBSCRIBER: "OFF" - ECAL_CORE_SERVICE: "OFF" - ECAL_CORE_TIMEPLUGIN: "OFF" - ECAL_CORE_TRANSPORT_UDP: "OFF" - ECAL_CORE_TRANSPORT_TCP: "OFF" - ECAL_CORE_TRANSPORT_SHM: "OFF" - ECAL_CORE_NPCAP_SUPPORT: "OFF" - ECAL_THIRDPARTY_BUILD_PROTOBUF: "OFF" - BUILD_SHARED_LIBS: "OFF" - CMAKE_BUILD_TYPE: "Release" runs-on: ${{ matrix.os }} diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 763f13c..fb1f1b2 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -203,27 +203,6 @@ jobs: ECAL_CORE_NPCAP_SUPPORT: "OFF" BUILD_SHARED_LIBS: "OFF" CMAKE_BUILD_TYPE: "Release" - ######################################## - - name: "monitoring_only" - ######################################## - ECAL_CORE_HAS_PROTOBUF: "ON" - ECAL_CORE_BUILD_SAMPLES: "ON" - ECAL_CORE_BUILD_TESTS: "ON" - ECAL_CORE_CONFIGURATION: "OFF" - ECAL_CORE_COMMAND_LINE: "OFF" - ECAL_CORE_REGISTRATION: "ON" - ECAL_CORE_REGISTRATION_SHM: "OFF" - ECAL_CORE_MONITORING: "ON" - ECAL_CORE_PUBLISHER: "OFF" - ECAL_CORE_SUBSCRIBER: "OFF" - ECAL_CORE_SERVICE: "OFF" - ECAL_CORE_TIMEPLUGIN: "OFF" - ECAL_CORE_TRANSPORT_UDP: "OFF" - ECAL_CORE_TRANSPORT_TCP: "OFF" - ECAL_CORE_TRANSPORT_SHM: "OFF" - ECAL_CORE_NPCAP_SUPPORT: "OFF" - BUILD_SHARED_LIBS: "OFF" - CMAKE_BUILD_TYPE: "Release" steps: - name: Checkout diff --git a/ecal/tests/cpp/registration_test_public/CMakeLists.txt b/ecal/tests/cpp/registration_test_public/CMakeLists.txt index 5a3aa4a..9605dc3 100644 --- a/ecal/tests/cpp/registration_test_public/CMakeLists.txt +++ b/ecal/tests/cpp/registration_test_public/CMakeLists.txt @@ -21,16 +21,20 @@ project(test_registration_public) find_package(Threads REQUIRED) find_package(GTest REQUIRED) -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 -) +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_src ${registration_test_topics_src}