Skip to content

Commit 2a64bb8

Browse files
committed
fix copyright, change cmake files
1 parent 60f150a commit 2a64bb8

File tree

6 files changed

+16
-9
lines changed

6 files changed

+16
-9
lines changed

CMake/lrs_options.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,5 @@ option(BUILD_RS2_ALL "Build realsense2-all static bundle containing all realsens
5656
option(ENABLE_SECURITY_FLAGS "Enable additional compiler security flags to enhance the build's security" OFF)
5757
option(USE_EXTERNAL_LZ4 "Use externally build LZ4 library instead of building and using the in this repo provided version" OFF)
5858
option(BUILD_ASAN "Enable AddressSanitizer" OFF)
59+
option(BUILD_ROSBAG2 "Build rosbag2 third-party components" OFF) # temporary flag, should be removed when fully integrated
5960
mark_as_advanced(BUILD_ASAN)

src/media/ros2/ros2_reader.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// License: Apache 2.0. See LICENSE file in root directory.
1+
// License: Apache 2.0 See LICENSE file in root directory.
2+
// Copyright(c) 2025 RealSense, Inc. All Rights Reserved.
23
#include "ros2_reader.h"
34
#include <rsutils/string/from.h>
45
#include <algorithm>

src/media/ros2/ros2_reader.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// License: Apache 2.0. See LICENSE file in root directory.
1+
// License: Apache 2.0 See LICENSE file in root directory.
2+
// Copyright(c) 2025 RealSense, Inc. All Rights Reserved.
23
#pragma once
34
#include <core/serialization.h>
45
#include <rosbag2_storage/storage_interfaces/read_only_interface.hpp>

src/media/ros2/ros2_writer.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// License: Apache 2.0. See LICENSE file in root directory.
1+
// License: Apache 2.0 See LICENSE file in root directory.
2+
// Copyright(c) 2025 RealSense, Inc. All Rights Reserved.
23
#include "ros2_writer.h"
34
#include <rcutils/time.h>
45
#include <rsutils/string/from.h>

src/media/ros2/ros2_writer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// License: Apache 2.0. See LICENSE file in root directory.
2-
// Copyright(c) 2025 RealSense, Inc.
1+
// License: Apache 2.0 See LICENSE file in root directory.
2+
// Copyright(c) 2025 RealSense, Inc. All Rights Reserved.
33
#pragma once
44

55
#include <core/serialization.h>

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
cmake_minimum_required(VERSION 3.10)
22
project(rosbag2_independent)
33

4-
# Allow consumers to opt-in explicitly; default OFF to avoid configuration failures
5-
option(BUILD_ROSBAG2 "Build rosbag2 third-party components" OFF)
64
if(NOT BUILD_ROSBAG2)
75
message(STATUS "rosbag2: BUILD_ROSBAG2=OFF - skipping build of rosbag2 third-party components")
86
return()
@@ -23,7 +21,7 @@ include(FetchContent)
2321
FetchContent_Declare(
2422
yaml-cpp
2523
GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git
26-
GIT_TAG master # using master for latest version, we can also pick a specific commit but we need one after version 0.8.0 - we need YAML_CPP_DISABLE_UNINSTALL flag
24+
GIT_TAG a83cd31548b19d50f3f983b069dceb4f4d50756d # need any commit/tag after tag 0.8.0 - we need YAML_CPP_DISABLE_UNINSTALL flag
2725
)
2826
# Disable yaml-cpp's uninstall target
2927
set(YAML_CPP_DISABLE_UNINSTALL ON CACHE BOOL "" FORCE)
@@ -95,7 +93,6 @@ target_link_libraries(rosbag2_independent INTERFACE
9593
include(config.cmake) # sets variables with values for header/source files and dirs
9694

9795
install(TARGETS
98-
rosbag2_independent
9996
rcutils
10097
rosbag2_storage
10198
rosbag2_storage_default_plugins
@@ -114,4 +111,10 @@ install(TARGETS
114111
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
115112
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
116113
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
114+
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} # to avoid sqlite3 warning
115+
)
116+
117+
# Install INTERFACE library separately
118+
install(TARGETS rosbag2_independent
119+
EXPORT realsense2Targets
117120
)

0 commit comments

Comments
 (0)