From d025fbfce9351a529f4322107b4cadc8db323973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Zako=C5=A1ek?= Date: Mon, 25 Aug 2025 07:55:53 +0200 Subject: [PATCH 1/2] Update to openDAQ 3.20 --- external/openDAQ/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/external/openDAQ/CMakeLists.txt b/external/openDAQ/CMakeLists.txt index ee754f1..567c099 100644 --- a/external/openDAQ/CMakeLists.txt +++ b/external/openDAQ/CMakeLists.txt @@ -3,10 +3,10 @@ set(OPENDAQ_ENABLE_TESTS false) FetchContent_Declare( openDAQ GIT_REPOSITORY https://github.com/openDAQ/openDAQ.git - GIT_TAG 14b647f955078e7d146513cfb2edc24a675fe679 + GIT_TAG v3.20.2 GIT_PROGRESS ON SYSTEM - FIND_PACKAGE_ARGS 3.0.0 GLOBAL + FIND_PACKAGE_ARGS 3.20.2 GLOBAL ) FetchContent_MakeAvailable(openDAQ) From ce6179147af78547f911acf77fbfd0cd596e89ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Zako=C5=A1ek?= Date: Mon, 25 Aug 2025 08:12:38 +0200 Subject: [PATCH 2/2] Fix compilation issues --- CMakeLists.txt | 4 ++++ asam_cmp_capture_module/tests/CMakeLists.txt | 1 + asam_cmp_data_sink/tests/CMakeLists.txt | 1 + asam_cmp_data_sink/tests/test_stream_fb.cpp | 2 +- asam_cmp_example/CMakeLists.txt | 4 ++++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ae258ac..7f4725e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 3.25) set(REPO_NAME asam_cmp_modules) set(REPO_OPTION_PREFIX ASAM_CMP) +if (MSVC) + add_compile_options(/bigobj) +endif() + project(${REPO_NAME} VERSION 1.0.0) if (POLICY CMP0135) diff --git a/asam_cmp_capture_module/tests/CMakeLists.txt b/asam_cmp_capture_module/tests/CMakeLists.txt index b15af39..8c95177 100644 --- a/asam_cmp_capture_module/tests/CMakeLists.txt +++ b/asam_cmp_capture_module/tests/CMakeLists.txt @@ -19,6 +19,7 @@ set(TEST_HEADERS if (MSVC) add_compile_options(/bigobj) + add_compile_options($<$:/wd4459>) endif() diff --git a/asam_cmp_data_sink/tests/CMakeLists.txt b/asam_cmp_data_sink/tests/CMakeLists.txt index 1301adb..06dd74e 100644 --- a/asam_cmp_data_sink/tests/CMakeLists.txt +++ b/asam_cmp_data_sink/tests/CMakeLists.txt @@ -12,6 +12,7 @@ set(TEST_SOURCES test_app.cpp if (MSVC) add_compile_options(/bigobj) + add_compile_options($<$:/wd4459>) endif() add_executable(${TEST_APP} ${TEST_SOURCES} diff --git a/asam_cmp_data_sink/tests/test_stream_fb.cpp b/asam_cmp_data_sink/tests/test_stream_fb.cpp index 223aa20..85174d1 100644 --- a/asam_cmp_data_sink/tests/test_stream_fb.cpp +++ b/asam_cmp_data_sink/tests/test_stream_fb.cpp @@ -649,7 +649,7 @@ class StreamFbEthernetPayloadTest : public StreamFbTest std::shared_ptr createEthernetPacket() { EthernetPayload ethernetPayload; - ethernetPayload.setData(binaryData.data(), binaryData.size()); + ethernetPayload.setData(binaryData.data(), (uint16_t)binaryData.size()); ethernetPacket = std::make_shared(); ethernetPacket->setPayload(ethernetPayload); diff --git a/asam_cmp_example/CMakeLists.txt b/asam_cmp_example/CMakeLists.txt index 7f48773..12f8991 100644 --- a/asam_cmp_example/CMakeLists.txt +++ b/asam_cmp_example/CMakeLists.txt @@ -1,5 +1,9 @@ add_executable(asam_cmp_modules_example main.cpp) +if (MSVC) + add_compile_options(/bigobj) +endif() + target_link_libraries(asam_cmp_modules_example PRIVATE daq::opendaq )