Skip to content

Replace deprecated openDAQ CMake utils calls #69

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
alexadereyko merged 1 commit into from
Mar 3, 2026
Merged

Replace deprecated openDAQ CMake utils calls #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion modules/asam_cmp_capture_module/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
get_current_folder_name(TARGET_FOLDER_NAME)
opendaq_get_current_folder_name(TARGET_FOLDER_NAME)
add_subdirectory(src)

if (${REPO_OPTION_PREFIX}_ENABLE_TESTS)
Expand Down
10 changes: 5 additions & 5 deletions modules/asam_cmp_capture_module/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ if (MSVC)
add_compile_options(/bigobj)
endif()

prepend_include(${TARGET_FOLDER_NAME} SRC_PrivateHeaders)
prepend_include(${TARGET_FOLDER_NAME} SRC_PublicHeaders)
opendaq_prepend_include(${TARGET_FOLDER_NAME} SRC_PrivateHeaders)
opendaq_prepend_include(${TARGET_FOLDER_NAME} SRC_PublicHeaders)

add_library(${LIB_NAME} SHARED
${SRC_Cpp}
Expand All @@ -61,7 +61,7 @@ target_include_directories(${LIB_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_
)

opendaq_set_module_properties(${LIB_NAME} ${PROJECT_VERSION_MAJOR})
create_version_header(${LIB_NAME})
opendaq_generate_version_header(${LIB_NAME})

install(TARGETS ${LIB_NAME}
COMPONENT RUNTIME
Expand Down Expand Up @@ -91,8 +91,8 @@ if (${REPO_OPTION_PREFIX}_ENABLE_TESTS)
dispatch.h
)

prepend_include(${TARGET_FOLDER_NAME} SRC_Lib_PrivateHeaders)
prepend_include(${TARGET_FOLDER_NAME} SRC_Lib_PublicHeaders)
opendaq_prepend_include(${TARGET_FOLDER_NAME} SRC_Lib_PrivateHeaders)
opendaq_prepend_include(${TARGET_FOLDER_NAME} SRC_Lib_PublicHeaders)

add_library(${PROJECT_NAME}_lib STATIC
${SRC_Lib_Cpp}
Expand Down
2 changes: 1 addition & 1 deletion modules/asam_cmp_data_sink/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
get_current_folder_name(TARGET_FOLDER_NAME)
opendaq_get_current_folder_name(TARGET_FOLDER_NAME)
add_subdirectory(src)

if (${REPO_OPTION_PREFIX}_ENABLE_TESTS)
Expand Down
10 changes: 5 additions & 5 deletions modules/asam_cmp_data_sink/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ if (MSVC)
add_compile_options(/bigobj)
endif()

prepend_include(${TARGET_FOLDER_NAME} SRC_PrivateHeaders)
prepend_include(${TARGET_FOLDER_NAME} SRC_PublicHeaders)
opendaq_prepend_include(${TARGET_FOLDER_NAME} SRC_PrivateHeaders)
opendaq_prepend_include(${TARGET_FOLDER_NAME} SRC_PublicHeaders)

add_library(${PROJECT_NAME} SHARED
${SRC_Cpp}
Expand All @@ -60,7 +60,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURR
)

opendaq_set_module_properties(${PROJECT_NAME} ${PROJECT_VERSION_MAJOR})
create_version_header(${PROJECT_NAME})
opendaq_generate_version_header(${PROJECT_NAME})

install(TARGETS ${PROJECT_NAME}
COMPONENT RUNTIME
Expand Down Expand Up @@ -91,8 +91,8 @@ if (${REPO_OPTION_PREFIX}_ENABLE_TESTS)
set(SRC_Lib_PrivateHeaders
)

prepend_include(${TARGET_FOLDER_NAME} SRC_Lib_PrivateHeaders)
prepend_include(${TARGET_FOLDER_NAME} SRC_Lib_PublicHeaders)
opendaq_prepend_include(${TARGET_FOLDER_NAME} SRC_Lib_PrivateHeaders)
opendaq_prepend_include(${TARGET_FOLDER_NAME} SRC_Lib_PublicHeaders)

add_library(${PROJECT_NAME}_lib STATIC
${SRC_Lib_Cpp}
Expand Down
2 changes: 1 addition & 1 deletion shared/libraries/asam_cmp_common_lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
get_current_folder_name(TARGET_FOLDER_NAME)
opendaq_get_current_folder_name(TARGET_FOLDER_NAME)
add_subdirectory(src)

if (${REPO_OPTION_PREFIX}_ENABLE_TESTS)
Expand Down
4 changes: 2 additions & 2 deletions shared/libraries/asam_cmp_common_lib/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ set(SRC_PublicHeaders common.h
set(SRC_PrivateHeaders
)

prepend_include(${TARGET_FOLDER_NAME} SRC_PrivateHeaders)
prepend_include(${TARGET_FOLDER_NAME} SRC_PublicHeaders)
opendaq_prepend_include(${TARGET_FOLDER_NAME} SRC_PrivateHeaders)
opendaq_prepend_include(${TARGET_FOLDER_NAME} SRC_PublicHeaders)

add_library(${PROJECT_NAME} STATIC
${SRC_Cpp}
Expand Down