move fetchContent location

Author: AviaAv

third-party/realsense-file/CMakeLists.txt

@@ -49,7 +49,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
 )
 
 target_link_libraries(${PROJECT_NAME} PUBLIC
-        yaml-cpp::yaml-cpp
+        yaml-cpp
         SQLite3
 )
 
@@ -60,7 +60,7 @@ set_target_properties (${PROJECT_NAME} PROPERTIES FOLDER Library)
 set(CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/../cmake/realsense2")
 
 install(TARGETS ${PROJECT_NAME}
-    #yaml-cpp # for testing it compiles on GHA
+    yaml-cpp
     EXPORT realsense2Targets
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

third-party/realsense-file/config.cmake

@@ -8,6 +8,37 @@ add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/rosbag2
 # Include rosbag2 configuration
 #include(${ROSBAG_DIR}2/config.cmake)
 
+
+# ---- FetchContent for direct library dependencies ----
+include(FetchContent)
+
+# yaml-cpp
+FetchContent_Declare(
+    yaml-cpp
+    GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git
+    GIT_TAG a83cd31548b19d50f3f983b069dceb4f4d50756d  # need any commit/tag after tag 0.8.0 - we need YAML_CPP_DISABLE_UNINSTALL flag
+)
+# Disable yaml-cpp's uninstall target
+set(YAML_CPP_DISABLE_UNINSTALL ON CACHE BOOL "" FORCE)
+
+FetchContent_MakeAvailable(yaml-cpp)
+
+# Force SQLite to export all symbols on Windows so the .lib is generated
+# There's probably a better way to do it but it works for now - either have the folder on the repo, or pass the flag
+# if there's no better way, we can and should restore the old flag
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+
+FetchContent_Declare(
+    sqlite3
+    GIT_REPOSITORY https://github.com/sjinks/sqlite3-cmake
+    GIT_TAG v3.49.1
+)
+FetchContent_MakeAvailable(sqlite3)
+
+# Reset it so it doesn't affect other libraries
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS OFF) # TODO restore previous value instead of forcing OFF
+
+
 list(APPEND ROSBAG_HEADER_DIRS ${ROSBAG2_HEADER_DIRS})
 list(APPEND SOURCE_FILES_ROSBAG ${SOURCE_FILES_ROSBAG2})
 list(APPEND HEADER_FILES_ROSBAG ${HEADER_FILES_ROSBAG2})

third-party/realsense-file/rosbag2/CMakeLists.txt

@@ -14,35 +14,6 @@ endif()
 
 set(CMAKE_CXX_STANDARD 14)
 
-# ---- FetchContent for direct library dependencies ----
-include(FetchContent)
-
-# yaml-cpp
-FetchContent_Declare(
-    yaml-cpp
-    GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git
-    GIT_TAG a83cd31548b19d50f3f983b069dceb4f4d50756d  # need any commit/tag after tag 0.8.0 - we need YAML_CPP_DISABLE_UNINSTALL flag
-)
-# Disable yaml-cpp's uninstall target
-set(YAML_CPP_DISABLE_UNINSTALL ON CACHE BOOL "" FORCE)
-
-FetchContent_MakeAvailable(yaml-cpp)
-
-# Force SQLite to export all symbols on Windows so the .lib is generated
-# There's probably a better way to do it but it works for now - either have the folder on the repo, or pass the flag
-# if there's no better way, we can and should restore the old flag
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-
-FetchContent_Declare(
-    sqlite3
-    GIT_REPOSITORY https://github.com/sjinks/sqlite3-cmake
-    GIT_TAG v3.49.1
-)
-FetchContent_MakeAvailable(sqlite3)
-
-# Reset it so it doesn't affect other libraries
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS OFF)
-
 # -- zstd --
 file(GLOB_RECURSE ZSTD_SOURCES
     "${CMAKE_CURRENT_LIST_DIR}/zstd/zstd.c"

third-party/realsense-file/rosbag2/config.cmake

@@ -20,6 +20,7 @@ set(HEADER_FILES_ROSBAG2
     ${HEADER_FILES_ROSBAG2_STORAGE}
     ${HEADER_FILES_ROSBAG2_STORAGE_DEFAULT_PLUGINS}
     ${HEADER_FILES_TINYXML2}
+    ${ZSTD_HEADERS}
 )
 
 
@@ -32,6 +33,7 @@ set(SOURCE_FILES_ROSBAG2
     ${SOURCE_FILES_ROSBAG2_STORAGE}
     ${SOURCE_FILES_ROSBAG2_STORAGE_DEFAULT_PLUGINS}
     ${SOURCE_FILES_TINYXML2}
+    ${ZSTD_SOURCES}
 )
 
 set(ROSBAG2_HEADER_DIRS