diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6fb1ec3..5a458a1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index e15280a..2f7aa9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 4f2433b..a8d6ad2 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -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) @@ -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}) diff --git a/opendaq_ref b/opendaq_ref index 88d050b..d0a6910 100644 --- a/opendaq_ref +++ b/opendaq_ref @@ -1 +1 @@ -main \ No newline at end of file +4757349a1db30721bead0cb695ec3a147913aef4