diff --git a/README.md b/README.md index 643c402..c2f94a7 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,14 @@ It uses [PcapPlusPlus Library](https://pcapplusplus.github.io/) to transport CMP - Support CAN / CAN-FD and Analog signals. - Gather information about Capture Modules appearing on the network. +## Prerequisites +On Windows, [Npcap](https://npcap.com/#download) must be installed with the **"Install Npcap in WinPcap API-compatible Mode"** option enabled. This option makes the packet-capture libraries (`wpcap.dll`, `packet.dll`) available system-wide, so the modules can locate them. If Npcap is already installed without this option, reinstall it with the option enabled. + ## Required tools before building - [CMake 3.24](https://cmake.org/) or higher - [Git](https://git-scm.com/) - libpcap - - [Npcap](https://npcap.com/#download) for Windows - must be installed in WinPcap API-compatible Mode + - [Npcap](https://npcap.com/#download) for Windows (see [Prerequisites](#prerequisites)) - [libpcap developers pack](https://www.tcpdump.org/#latest-release) for Linux can be installed through a package manager `sudo apt-get install libpcap-dev` - Compiler: diff --git a/modules/asam_cmp_capture_module/src/CMakeLists.txt b/modules/asam_cmp_capture_module/src/CMakeLists.txt index cf108a7..26747cd 100644 --- a/modules/asam_cmp_capture_module/src/CMakeLists.txt +++ b/modules/asam_cmp_capture_module/src/CMakeLists.txt @@ -1,5 +1,5 @@ project(asam_cmp_capture_module - VERSION 1.0.0 + VERSION ${${REPO_OPTION_PREFIX}_VERSION} LANGUAGES CXX) set(LIB_NAME asam_cmp_capture_module) diff --git a/modules/asam_cmp_data_sink/src/CMakeLists.txt b/modules/asam_cmp_data_sink/src/CMakeLists.txt index 166fc6f..5e14970 100644 --- a/modules/asam_cmp_data_sink/src/CMakeLists.txt +++ b/modules/asam_cmp_data_sink/src/CMakeLists.txt @@ -1,4 +1,4 @@ -project(asam_cmp_data_sink LANGUAGES CXX VERSION 1.0.0) +project(asam_cmp_data_sink LANGUAGES CXX VERSION ${${REPO_OPTION_PREFIX}_VERSION}) set(SRC_Cpp module_dll.cpp data_sink_module.cpp diff --git a/opendaq_ref b/opendaq_ref index 88d050b..6963484 100644 --- a/opendaq_ref +++ b/opendaq_ref @@ -1 +1 @@ -main \ No newline at end of file +v3.40.1 \ No newline at end of file diff --git a/shared/libraries/asam_cmp_common_lib/src/CMakeLists.txt b/shared/libraries/asam_cmp_common_lib/src/CMakeLists.txt index 08acbad..48d1ab0 100644 --- a/shared/libraries/asam_cmp_common_lib/src/CMakeLists.txt +++ b/shared/libraries/asam_cmp_common_lib/src/CMakeLists.txt @@ -1,4 +1,4 @@ -project(asam_cmp_common_lib LANGUAGES CXX VERSION 1.0.0) +project(asam_cmp_common_lib LANGUAGES CXX VERSION ${${REPO_OPTION_PREFIX}_VERSION}) set(SRC_Cpp interface_common_fb.cpp ethernet_pcpp_impl.cpp