Skip to content

Commit aaa7c05

Browse files
MMirbachMMirbach
committed
realsense2 is gone from rs-align
1 parent 561d79f commit aaa7c05

File tree

28 files changed

+38
-40
lines changed

28 files changed

+38
-40
lines changed

‎CMake/global_config.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ endmacro()
8989
macro(global_target_config)
9090
target_link_libraries(${LRS_TARGET} PRIVATE realsense-file ${CMAKE_THREAD_LIBS_INIT})
9191

92-
include_directories(${LRS_TARGET} src)
92+
include_directories(src)
9393

9494
set_target_properties (${LRS_TARGET} PROPERTIES FOLDER Library)
9595

‎examples/align-advanced/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if(BUILD_GRAPHICAL_EXAMPLES)
99
add_executable(rs-align-advanced rs-align-advanced.cpp ../../third-party/imgui/imgui.cpp ../../third-party/imgui/imgui_draw.cpp ../../third-party/imgui/imgui_impl_glfw.cpp)
1010
set_property(TARGET rs-align-advanced PROPERTY CXX_STANDARD 11)
1111
target_link_libraries(rs-align-advanced ${DEPENDENCIES})
12-
include_directories(rs-align-advanced ../../common ../../third-party/imgui)
12+
include_directories(../../common ../../third-party/imgui)
1313
set_target_properties (rs-align-advanced PROPERTIES FOLDER Examples)
1414
install(TARGETS rs-align-advanced RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
1515
endif()

‎examples/align/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if(BUILD_GRAPHICAL_EXAMPLES)
99
add_executable(rs-align rs-align.cpp ../../third-party/imgui/imgui.cpp ../../third-party/imgui/imgui_draw.cpp ../../third-party/imgui/imgui_impl_glfw.cpp)
1010
set_property(TARGET rs-align PROPERTY CXX_STANDARD 11)
1111
target_link_libraries(rs-align ${DEPENDENCIES})
12-
include_directories(rs-align ../../common ../../third-party/imgui)
12+
include_directories(../../common ../../third-party/imgui)
1313
set_target_properties (rs-align PROPERTIES FOLDER Examples)
1414
install(TARGETS rs-align RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
1515
endif()

‎examples/capture/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if(BUILD_GRAPHICAL_EXAMPLES)
99
add_executable(rs-capture rs-capture.cpp ../example.hpp)
1010
set_property(TARGET rs-capture PROPERTY CXX_STANDARD 11)
1111
target_link_libraries(rs-capture ${DEPENDENCIES})
12-
include_directories(rs-capture ../ ../../third-party/tclap/include)
12+
include_directories(../ ../../third-party/tclap/include)
1313
set_target_properties (rs-capture PROPERTIES FOLDER "Examples")
1414

1515
install(TARGETS rs-capture RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

‎examples/gl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if(BUILD_GRAPHICAL_EXAMPLES AND NOT APPLE)
2121
#pointcloud
2222
add_executable(rs-gl rs-gl.cpp ../example.hpp)
2323
target_link_libraries(rs-gl ${DEPENDENCIES} realsense2-gl)
24-
include_directories(rs-gl ../)
24+
include_directories(../)
2525
set_target_properties (rs-gl PROPERTIES FOLDER Examples)
2626
install(TARGETS rs-gl RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
2727
endif()

‎examples/hdr/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if(BUILD_GRAPHICAL_EXAMPLES)
99
add_executable(rs-hdr rs-hdr.cpp ../example.hpp)
1010
set_property(TARGET rs-hdr PROPERTY CXX_STANDARD 11)
1111
target_link_libraries(rs-hdr ${DEPENDENCIES})
12-
include_directories(rs-hdr ../ ../../third-party/tclap/include)
12+
include_directories(../ ../../third-party/tclap/include)
1313
set_target_properties (rs-hdr PROPERTIES FOLDER "Examples")
1414

1515
install(TARGETS rs-hdr RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

‎examples/hello-realsense/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ project(RealsenseExamplesHelloRealSense)
88
add_executable(rs-hello-realsense rs-hello-realsense.cpp)
99
set_property(TARGET rs-hello-realsense PROPERTY CXX_STANDARD 11)
1010
target_link_libraries(rs-hello-realsense ${DEPENDENCIES})
11-
include_directories(rs-hello-realsense)
1211
set_target_properties (rs-hello-realsense PROPERTIES FOLDER "Examples")
1312

1413
install(TARGETS rs-hello-realsense RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

‎examples/measure/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if(BUILD_GRAPHICAL_EXAMPLES)
1212
add_executable(rs-measure rs-measure.cpp ../example.hpp)
1313
set_property(TARGET rs-measure PROPERTY CXX_STANDARD 11)
1414
target_link_libraries(rs-measure ${DEPENDENCIES} Threads::Threads)
15-
include_directories(rs-measure ../)
15+
include_directories(../)
1616
set_target_properties (rs-measure PROPERTIES FOLDER "Examples")
1717

1818
install(TARGETS rs-measure RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

‎examples/multicam/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ project(RealsenseExamplesMulticam)
88
if(BUILD_GRAPHICAL_EXAMPLES)
99
add_executable(rs-multicam rs-multicam.cpp ../example.hpp)
1010
set_property(TARGET rs-multicam PROPERTY CXX_STANDARD 11)
11-
include_directories(rs-multicam ../)
11+
include_directories(../)
1212
target_link_libraries(rs-multicam ${DEPENDENCIES})
1313
set_target_properties (rs-multicam PROPERTIES FOLDER Examples)
1414
install(TARGETS rs-multicam RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

‎examples/pointcloud/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if(BUILD_GRAPHICAL_EXAMPLES)
99
add_executable(rs-pointcloud rs-pointcloud.cpp ../example.hpp)
1010
set_property(TARGET rs-pointcloud PROPERTY CXX_STANDARD 11)
1111
target_link_libraries(rs-pointcloud ${DEPENDENCIES})
12-
include_directories(rs-pointcloud ../)
12+
include_directories(../)
1313
set_target_properties (rs-pointcloud PROPERTIES FOLDER Examples)
1414
install(TARGETS rs-pointcloud RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
1515
endif()

‎examples/post-processing/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if(BUILD_GRAPHICAL_EXAMPLES)
99
add_executable(rs-post-processing rs-post-processing.cpp ../example.hpp ../../third-party/imgui/imgui.cpp ../../third-party/imgui/imgui_draw.cpp ../../third-party/imgui/imgui_impl_glfw.cpp)
1010
set_property(TARGET rs-post-processing PROPERTY CXX_STANDARD 11)
1111
target_link_libraries(rs-post-processing ${DEPENDENCIES})
12-
include_directories(rs-post-processing ../ ../../third-party/tclap/include ../../third-party/imgui)
12+
include_directories(../ ../../third-party/tclap/include ../../third-party/imgui)
1313
set_target_properties (rs-post-processing PROPERTIES FOLDER "Examples")
1414
install(TARGETS rs-post-processing RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
1515
endif()

‎examples/record-playback/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if(BUILD_GRAPHICAL_EXAMPLES)
99
add_executable(rs-record-playback rs-record-playback.cpp ../example.hpp ../../third-party/imgui/imgui.cpp ../../third-party/imgui/imgui_draw.cpp ../../third-party/imgui/imgui_impl_glfw.cpp)
1010
set_property(TARGET rs-record-playback PROPERTY CXX_STANDARD 11)
1111
target_link_libraries(rs-record-playback ${DEPENDENCIES})
12-
include_directories(rs-record-playback ../ ../../third-party/tclap/include ../../third-party/imgui)
12+
include_directories(../ ../../third-party/tclap/include ../../third-party/imgui)
1313
set_target_properties (rs-record-playback PROPERTIES FOLDER "Examples")
1414
install(TARGETS rs-record-playback RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
1515
endif()

‎examples/save-to-disk/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ project(RealsenseExamplesSaveToDisk)
88
add_executable(rs-save-to-disk rs-save-to-disk.cpp)
99
set_property(TARGET rs-save-to-disk PROPERTY CXX_STANDARD 11)
1010
target_link_libraries(rs-save-to-disk ${DEPENDENCIES})
11-
include_directories(rs-save-to-disk ../../common ../../third-party ../../third-party/tclap/include)
11+
include_directories(../../common ../../third-party ../../third-party/tclap/include)
1212
set_target_properties (rs-save-to-disk PROPERTIES FOLDER "Examples")
1313
install(TARGETS rs-save-to-disk RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

‎examples/sensor-control/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ if(BUILD_GRAPHICAL_EXAMPLES)
99
add_executable(rs-sensor-control api_how_to.h rs-sensor-control.cpp)
1010
set_property(TARGET rs-sensor-control PROPERTY CXX_STANDARD 11)
1111
target_link_libraries(rs-sensor-control ${DEPENDENCIES})
12-
include_directories(rs-sensor-control)
1312
set_target_properties (rs-sensor-control PROPERTIES FOLDER Examples)
1413
install(TARGETS rs-sensor-control RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
1514
endif()

‎examples/software-device/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if(BUILD_GRAPHICAL_EXAMPLES)
1212
add_executable(rs-software-device rs-software-device.cpp)
1313
set_property(TARGET rs-software-device PROPERTY CXX_STANDARD 11)
1414
target_link_libraries(rs-software-device ${DEPENDENCIES})
15-
include_directories(rs-software-device ../ ../../third-party/tclap/include ../../third-party/ ../../common/res)
15+
include_directories(../ ../../third-party/tclap/include ../../third-party/ ../../common/res)
1616
set_target_properties (rs-software-device PROPERTIES FOLDER "Examples")
1717
install(TARGETS rs-software-device RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
1818
endif()

‎examples/tracking-and-depth/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if(BUILD_GRAPHICAL_EXAMPLES)
99
add_executable(rs-tracking-and-depth rs-tracking-and-depth.cpp ../example.hpp)
1010
set_property(TARGET rs-tracking-and-depth PROPERTY CXX_STANDARD 11)
1111
target_link_libraries(rs-tracking-and-depth ${DEPENDENCIES})
12-
include_directories(rs-tracking-and-depth ../)
12+
include_directories(../)
1313
set_target_properties (rs-tracking-and-depth PROPERTIES FOLDER Examples)
1414
install(TARGETS rs-tracking-and-depth RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
1515
add_custom_command(

‎src/compression/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ set(COMPRESSION_SOURCES ${COMPRESSION_SOURCES} ${LZ4_DIR}/lz4.h ${LZ4_DIR}/lz4.c
1919

2020
add_library(${PROJECT_NAME} STATIC ${COMPRESSION_SOURCES})
2121

22-
include_directories(${PROJECT_NAME}
22+
include_directories(
2323
../../common
2424
../ipDeviceCommon
2525
../../third-party/easyloggingpp/src
@@ -33,7 +33,7 @@ add_dependencies(${PROJECT_NAME}
3333
libjpeg-turbo
3434
)
3535

36-
include_directories(${PROJECT_NAME}
36+
include_directories(
3737
${CMAKE_BINARY_DIR}/libjpeg-turbo/include
3838
${LZ4_DIR}
3939
)

‎tools/benchmark/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ endif()
2121
if(BUILD_GRAPHICAL_EXAMPLES)
2222
add_executable(rs-benchmark rs-benchmark.cpp ../../third-party/glad/glad.c)
2323
target_link_libraries(rs-benchmark ${DEPENDENCIES} realsense2-gl)
24-
include_directories(rs-benchmark ../../third-party/tclap/include ../../third-party/glad)
24+
include_directories(../../third-party/tclap/include ../../third-party/glad)
2525
set_target_properties (rs-benchmark PROPERTIES
2626
FOLDER Tools
2727
)

‎tools/convert/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ add_executable(${RS_TARGET} rs-convert.cpp
1919
)
2020
set_property(TARGET ${RS_TARGET} PROPERTY CXX_STANDARD 11)
2121
target_link_libraries(${RS_TARGET} ${DEPENDENCIES} Threads::Threads)
22-
include_directories(${RS_TARGET} ../../common ../../third-party ../../third-party/tclap/include)
22+
include_directories(../../common ../../third-party ../../third-party/tclap/include)
2323

2424
set_target_properties (${RS_TARGET} PROPERTIES
2525
FOLDER "Tools"

‎tools/data-collect/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ project(RealsenseToolsDataCollect)
88
add_executable(rs-data-collect rs-data-collect.h rs-data-collect.cpp)
99
set_property(TARGET rs-data-collect PROPERTY CXX_STANDARD 11)
1010
target_link_libraries(rs-data-collect ${DEPENDENCIES})
11-
include_directories(rs-data-collect ../../common ../../third-party/tclap/include)
11+
include_directories(../../common ../../third-party/tclap/include)
1212
set_target_properties (rs-data-collect PROPERTIES
1313
FOLDER "Tools"
1414
)

‎tools/depth-quality/CMakeLists.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ if(BUILD_GRAPHICAL_EXAMPLES)
7373
depth-metrics.h
7474
${COMMON_SRC})
7575

76-
include_directories(rs-depth-quality ../../common ../../third-party
77-
../../third-party/imgui
78-
../../third-party/glad
79-
../../third-party/tclap/include
80-
../../third-party/tinyfiledialogs
81-
${CMAKE_CURRENT_SOURCE_DIR}/res/)
76+
include_directories(../../common ../../third-party
77+
../../third-party/imgui
78+
../../third-party/glad
79+
../../third-party/tclap/include
80+
../../third-party/tinyfiledialogs
81+
${CMAKE_CURRENT_SOURCE_DIR}/res/)
8282

8383
#list(TRANSFORM DELAYED PREPEND " /DELAYLOAD:")
8484
PREPEND(DELAYED " /DELAYLOAD:" ${DELAYED})
@@ -92,11 +92,11 @@ if(BUILD_GRAPHICAL_EXAMPLES)
9292
${ELPP_FILES}
9393
)
9494

95-
include_directories(rs-depth-quality ../../common ../../third-party
96-
../../third-party/imgui
97-
../../third-party/glad
98-
../../third-party/tinyfiledialogs
99-
../../third-party/tclap/include)
95+
include_directories(../../common ../../third-party
96+
../../third-party/imgui
97+
../../third-party/glad
98+
../../third-party/tinyfiledialogs
99+
../../third-party/tclap/include)
100100
endif()
101101

102102
source_group("EasyLogging++" FILES ${ELPP_FILES})

‎tools/enumerate-devices/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ project(RealsenseExamplesEnumerateDevices)
88
add_executable(rs-enumerate-devices rs-enumerate-devices.cpp)
99
set_property(TARGET rs-enumerate-devices PROPERTY CXX_STANDARD 11)
1010
target_link_libraries(rs-enumerate-devices ${DEPENDENCIES})
11-
include_directories(rs-enumerate-devices ../../third-party/tclap/include)
11+
include_directories(../../third-party/tclap/include)
1212
set_target_properties (rs-enumerate-devices PROPERTIES
1313
FOLDER Tools
1414
)

‎tools/fw-logger/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if(WIN32 OR ANDROID)
1212
else()
1313
target_link_libraries(rs-fw-logger -lpthread ${DEPENDENCIES})
1414
endif()
15-
include_directories(rs-fw-logger ../../third-party/tclap/include cpp-fw-logger-helpers)
15+
include_directories(../../third-party/tclap/include cpp-fw-logger-helpers)
1616
set_target_properties (rs-fw-logger PROPERTIES
1717
FOLDER Tools
1818
)

‎tools/recorder/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ project(RealsenseToolsRecorder)
88
add_executable(rs-record rs-record.cpp)
99
set_property(TARGET rs-record PROPERTY CXX_STANDARD 11)
1010
target_link_libraries(rs-record ${DEPENDENCIES})
11-
include_directories(rs-record ../../common ../../third-party/tclap/include)
11+
include_directories(../../common ../../third-party/tclap/include)
1212
set_target_properties (rs-record PROPERTIES
1313
FOLDER "Tools"
1414
)

‎tools/rosbag-inspector/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ if(BUILD_GRAPHICAL_EXAMPLES)
2626
if(WIN32)
2727
add_executable(rs-rosbag-inspector WIN32 ${RS_ROSBAG_INSPECTOR_CPP})
2828

29-
include_directories(rs-rosbag-inspector ../../third-party/imgui ../../common ../../third-party/glad
29+
include_directories(../../third-party/imgui ../../common ../../third-party/glad
3030
../../third-party/tinyfiledialogs ../../third-party ${CMAKE_CURRENT_SOURCE_DIR}/res/)
3131
else()
3232
add_executable(rs-rosbag-inspector ${RS_ROSBAG_INSPECTOR_CPP})
33-
include_directories(rs-rosbag-inspector ../../third-party/imgui ../../common ../../third-party/glad
33+
include_directories(../../third-party/imgui ../../common ../../third-party/glad
3434
../../third-party/tinyfiledialogs ../../third-party)
3535
endif()
3636
set_property(TARGET rs-rosbag-inspector PROPERTY CXX_STANDARD 11)

‎tools/rs-server/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ else()
3636
add_executable(${PROJECT_NAME} ${RS_SERVER_SOURCES})
3737
add_definitions(-DELPP_NO_DEFAULT_LOG_FILE)
3838

39-
include_directories(${PROJECT_NAME}
39+
include_directories(
4040
../../common
4141
../../src/ipDeviceCommon
4242
../../include/librealsense2

‎tools/terminal/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if(WIN32 OR ANDROID)
1212
else()
1313
target_link_libraries(rs-terminal -lpthread ${DEPENDENCIES})
1414
endif()
15-
include_directories(rs-terminal ../../common ../../third-party ../../third-party/tclap/include)
15+
include_directories(../../common ../../third-party ../../third-party/tclap/include)
1616
set_target_properties (rs-terminal PROPERTIES
1717
FOLDER Tools
1818
)

‎unit-tests/internal/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ set (INTERNAL_TESTS_SOURCES
2020
add_executable(${PROJECT_NAME} ${INTERNAL_TESTS_SOURCES})
2121
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)
2222
target_link_libraries(${PROJECT_NAME} ${DEPENDENCIES})
23-
include_directories(${PROJECT_NAME} ../ ../../src/)
23+
include_directories(../ ../../src/)
2424
set_target_properties (${PROJECT_NAME} PROPERTIES FOLDER "Unit-Tests")
2525

2626
if(UNIX)

0 commit comments

Comments
 (0)