Skip to content

Other/update to opendaq 3.20 #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alien588 merged 2 commits into from
Aug 25, 2025
Merged

Other/update to opendaq 3.20 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d025fbf
Update to openDAQ 3.20
alien588 Aug 25, 2025
ce61791
Fix compilation issues
alien588 Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions asam_cmp_capture_module/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ set(TEST_HEADERS

if (MSVC)
add_compile_options(/bigobj)
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4459>)
endif()


Expand Down
1 change: 1 addition & 0 deletions asam_cmp_data_sink/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ set(TEST_SOURCES test_app.cpp

if (MSVC)
add_compile_options(/bigobj)
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4459>)
endif()

add_executable(${TEST_APP} ${TEST_SOURCES}
Expand Down
2 changes: 1 addition & 1 deletion asam_cmp_data_sink/tests/test_stream_fb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ class StreamFbEthernetPayloadTest : public StreamFbTest
std::shared_ptr<Packet> createEthernetPacket()
{
EthernetPayload ethernetPayload;
ethernetPayload.setData(binaryData.data(), binaryData.size());
ethernetPayload.setData(binaryData.data(), (uint16_t)binaryData.size());

ethernetPacket = std::make_shared<Packet>();
ethernetPacket->setPayload(ethernetPayload);
Expand Down
4 changes: 4 additions & 0 deletions asam_cmp_example/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
)
Expand Down
4 changes: 2 additions & 2 deletions external/openDAQ/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Loading