From f5296ab1ce7e05baac0db4466520b24ea853d1bf Mon Sep 17 00:00:00 2001 From: Aliaksandr Adziareika <8034372+alexadereyko@users.noreply.github.com> Date: Wed, 18 Mar 2026 14:27:30 +0100 Subject: [PATCH 1/3] Migrate to target-based enforcement approach - Update opendaq-cmake-utils to v1.0.1 including target-based enforcement - Allow ANCIENT non-target-based CMake mode for external dependencies --- cmake/CMakeLists.txt | 2 +- external/streaming_protocol/CMakeLists.txt | 5 ++++- opendaq_ref | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 5717a52..02fc70b 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -8,7 +8,7 @@ include(FetchContent) FetchContent_Declare( opendaq-cmake-utils GIT_REPOSITORY https://github.com/openDAQ/opendaq-cmake-utils.git - GIT_TAG v1.0.0 + GIT_TAG v1.0.1 GIT_PROGRESS ON ) FetchContent_MakeAvailable(opendaq-cmake-utils) diff --git a/external/streaming_protocol/CMakeLists.txt b/external/streaming_protocol/CMakeLists.txt index 5844f35..db76739 100644 --- a/external/streaming_protocol/CMakeLists.txt +++ b/external/streaming_protocol/CMakeLists.txt @@ -10,6 +10,9 @@ opendaq_dependency( NAME streaming_protocol REQUIRED_VERSION 1.2.8 GIT_REPOSITORY https://github.com/openDAQ/streaming-protocol-lt.git - GIT_REF v1.2.8-dev + # GIT_REF v1.2.8-dev + GIT_REF jira/TBBAS-3121-apply-opendaq-cmake-utils EXPECT_TARGET daq::streaming_protocol + # PATCH_FILES + # ${CMAKE_CURRENT_SOURCE_DIR}/patches/streaming-protocol-fix-modern-cmake.patch ) diff --git a/opendaq_ref b/opendaq_ref index 88d050b..8656325 100644 --- a/opendaq_ref +++ b/opendaq_ref @@ -1 +1 @@ -main \ No newline at end of file +jira/TBBAS-3072-fix-modern-cmake-mode \ No newline at end of file From 509747e3526b4f353d82671f0a44c263788c778a Mon Sep 17 00:00:00 2001 From: Aliaksandr Adziareika <8034372+alexadereyko@users.noreply.github.com> Date: Thu, 19 Mar 2026 14:08:17 +0100 Subject: [PATCH 2/3] Update streaming-protocol-lt version v1.2.8 --- external/streaming_protocol/CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/external/streaming_protocol/CMakeLists.txt b/external/streaming_protocol/CMakeLists.txt index db76739..824ab14 100644 --- a/external/streaming_protocol/CMakeLists.txt +++ b/external/streaming_protocol/CMakeLists.txt @@ -10,9 +10,6 @@ opendaq_dependency( NAME streaming_protocol REQUIRED_VERSION 1.2.8 GIT_REPOSITORY https://github.com/openDAQ/streaming-protocol-lt.git - # GIT_REF v1.2.8-dev - GIT_REF jira/TBBAS-3121-apply-opendaq-cmake-utils + GIT_REF v1.2.8 EXPECT_TARGET daq::streaming_protocol - # PATCH_FILES - # ${CMAKE_CURRENT_SOURCE_DIR}/patches/streaming-protocol-fix-modern-cmake.patch ) From e6e6ab00dc0d036ef5c9d1abc114c38f216c6fee Mon Sep 17 00:00:00 2001 From: Aliaksandr Adziareika <8034372+alexadereyko@users.noreply.github.com> Date: Fri, 20 Mar 2026 08:22:10 +0100 Subject: [PATCH 3/3] Set opendaq ref to main Keep opendaq_ref pointing to main until the target-based CMake enforcement fix is merged into openDAQ --- opendaq_ref | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendaq_ref b/opendaq_ref index 8656325..88d050b 100644 --- a/opendaq_ref +++ b/opendaq_ref @@ -1 +1 @@ -jira/TBBAS-3072-fix-modern-cmake-mode \ No newline at end of file +main \ No newline at end of file