PR #12245 from Eran: bump fastdds to v2.11.2

IntelRealSense · Oct 3, 2023 · 54286c6 · 54286c6
2 parents 3b52e44 + bdd3127
commit 54286c6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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)