From bdd31271312271d2d41f722c51b8ea27f41a5e41 Mon Sep 17 00:00:00 2001 From: Eran Date: Mon, 2 Oct 2023 08:31:05 +0300 Subject: [PATCH] bump fastdds to v2.11.2 --- CMake/external_fastdds.cmake | 6 ++++-- CMake/lrs_options.cmake | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMake/external_fastdds.cmake b/CMake/external_fastdds.cmake index a1162949ad..8c6739e7b8 100644 --- a/CMake/external_fastdds.cmake +++ b/CMake/external_fastdds.cmake @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.16.3) # same as in FastDDS (U20) include(FetchContent) # We use a function to enforce a scoped variables creation only for FastDDS build (i.e turn off BUILD_SHARED_LIBS which is used on LRS build as well) @@ -16,7 +16,7 @@ function(get_fastdds) FetchContent_Declare( fastdds GIT_REPOSITORY https://github.com/eProsima/Fast-DDS.git - GIT_TAG v2.9.1 + GIT_TAG v2.11.2 GIT_SUBMODULES "" # Submodules will be cloned as part of the FastDDS cmake configure stage GIT_SHALLOW ON # No history needed SOURCE_DIR ${CMAKE_BINARY_DIR}/third-party/fastdds @@ -31,6 +31,8 @@ function(get_fastdds) set(COMPILE_TOOLS OFF CACHE INTERNAL "" FORCE) set(BUILD_TESTING OFF CACHE INTERNAL "" FORCE) set(SQLITE3_SUPPORT OFF CACHE INTERNAL "" FORCE) + #set(ENABLE_OLD_LOG_MACROS OFF CACHE INTERNAL "" FORCE) doesn't work + set(FASTDDS_STATISTICS OFF CACHE INTERNAL "" FORCE) # Set special values for FastDDS sub directory set(BUILD_SHARED_LIBS OFF) diff --git a/CMake/lrs_options.cmake b/CMake/lrs_options.cmake index f1c1c50e06..879e0d44c8 100644 --- a/CMake/lrs_options.cmake +++ b/CMake/lrs_options.cmake @@ -46,5 +46,5 @@ else() option(ENABLE_EASYLOGGINGPP_ASYNC "Switch Logger to Asynchronous Mode (set OFF for Synchronous Mode)" OFF) endif() option(BUILD_PC_STITCHING "Build pointcloud-stitching example" OFF) -option(BUILD_WITH_DDS "Use FastDDS to access camera devices through DDS topics" OFF) +option(BUILD_WITH_DDS "Access camera devices through DDS topics (requires CMake 3.16.3)" OFF)