Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:

- name: Add DLL path (Windows only)
if: matrix.os == 'windows-latest'
run: echo "${{ env.INSTALL_PREFIX }}/lib" >> $env:GITHUB_PATH
run: echo "${{ env.INSTALL_PREFIX }}/bin" >> $env:GITHUB_PATH

- name: Configure project with CMake
working-directory: module
Expand Down
9 changes: 9 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,15 @@ if (NOT TARGET "${OPENDAQ_SDK_TARGET_NAMESPACE}::${OPENDAQ_SDK_TARGET_NAME}")
FetchContent_MakeAvailable(${OPENDAQ_SDK_NAME})
else()
message(STATUS "Found installed ${OPENDAQ_SDK_NAME} version: ${${OPENDAQ_SDK_NAME}_VERSION}")
set(OPENDAQ_ALWAYS_FETCH_FMT OFF CACHE BOOL "" FORCE)

# Workaround: installed openDAQ coretypes uses INSTALL_INTERFACE:fmt::fmt-header-only
# which propagates FMT_HEADER_ONLY=1, conflicting with compiled fmt::fmt
# used by spdlog (LNK2005 on MSVC). Redirect fmt-header-only to compiled fmt.
if (TARGET fmt::fmt-header-only AND TARGET fmt::fmt)
set_property(TARGET fmt::fmt-header-only PROPERTY INTERFACE_COMPILE_DEFINITIONS "")
target_link_libraries(fmt::fmt-header-only INTERFACE fmt::fmt)
endif()
endif()
endif()
add_subdirectory(external/boost)
Expand Down
3 changes: 3 additions & 0 deletions external/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
opendaq_get_cmake_mode(_LT_STREAMING_CMAKE_LEGACY_MODE_SAVED)
opendaq_set_cmake_mode(ANCIENT)
set(CMAKE_FOLDER external)
list(APPEND CMAKE_MESSAGE_CONTEXT external)

Expand All @@ -13,3 +15,4 @@ add_subdirectory(spdlog EXCLUDE_FROM_ALL)
add_subdirectory(nlohmann_json EXCLUDE_FROM_ALL)
add_subdirectory(streaming_protocol EXCLUDE_FROM_ALL)

opendaq_set_cmake_mode(${_LT_STREAMING_CMAKE_LEGACY_MODE_SAVED})
2 changes: 1 addition & 1 deletion opendaq_ref
Original file line number Diff line number Diff line change
@@ -1 +1 @@
main
4757349a1db30721bead0cb695ec3a147913aef4
Loading