realsense2 is gone from rs-align

tomqyp · Jan 5, 2021 · aaa7c05 · aaa7c05
1 parent 561d79f
commit aaa7c05
Show file tree

Hide file tree

Showing 28 changed files with 38 additions and 40 deletions.
diff --git a/CMake/global_config.cmake b/CMake/global_config.cmake
@@ -89,7 +89,7 @@ endmacro()
 macro(global_target_config)
     target_link_libraries(${LRS_TARGET} PRIVATE realsense-file ${CMAKE_THREAD_LIBS_INIT})
 
-    include_directories(${LRS_TARGET} src)
+    include_directories(src)
 
     set_target_properties (${LRS_TARGET} PROPERTIES FOLDER Library)
 

diff --git a/examples/align-advanced/CMakeLists.txt b/examples/align-advanced/CMakeLists.txt
@@ -9,7 +9,7 @@ if(BUILD_GRAPHICAL_EXAMPLES)
     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)
     set_property(TARGET rs-align-advanced PROPERTY CXX_STANDARD 11)
     target_link_libraries(rs-align-advanced ${DEPENDENCIES})
-    include_directories(rs-align-advanced ../../common ../../third-party/imgui)
+    include_directories(../../common ../../third-party/imgui)
     set_target_properties (rs-align-advanced PROPERTIES FOLDER Examples)
     install(TARGETS rs-align-advanced RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
diff --git a/examples/align/CMakeLists.txt b/examples/align/CMakeLists.txt
@@ -9,7 +9,7 @@ if(BUILD_GRAPHICAL_EXAMPLES)
     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)
     set_property(TARGET rs-align PROPERTY CXX_STANDARD 11)
     target_link_libraries(rs-align ${DEPENDENCIES})
-    include_directories(rs-align ../../common ../../third-party/imgui)
+    include_directories(../../common ../../third-party/imgui)
     set_target_properties (rs-align PROPERTIES FOLDER Examples)
     install(TARGETS rs-align RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
diff --git a/examples/capture/CMakeLists.txt b/examples/capture/CMakeLists.txt
@@ -9,7 +9,7 @@ if(BUILD_GRAPHICAL_EXAMPLES)
     add_executable(rs-capture rs-capture.cpp ../example.hpp)
     set_property(TARGET rs-capture PROPERTY CXX_STANDARD 11)
     target_link_libraries(rs-capture ${DEPENDENCIES})
-    include_directories(rs-capture ../ ../../third-party/tclap/include)
+    include_directories(../ ../../third-party/tclap/include)
     set_target_properties (rs-capture PROPERTIES FOLDER "Examples")
 
     install(TARGETS rs-capture RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

diff --git a/examples/gl/CMakeLists.txt b/examples/gl/CMakeLists.txt
@@ -21,7 +21,7 @@ if(BUILD_GRAPHICAL_EXAMPLES AND NOT APPLE)
     #pointcloud
     add_executable(rs-gl rs-gl.cpp ../example.hpp)
     target_link_libraries(rs-gl ${DEPENDENCIES} realsense2-gl)
-    include_directories(rs-gl ../)
+    include_directories(../)
     set_target_properties (rs-gl PROPERTIES FOLDER Examples)
     install(TARGETS rs-gl RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
diff --git a/examples/hdr/CMakeLists.txt b/examples/hdr/CMakeLists.txt
@@ -9,7 +9,7 @@ if(BUILD_GRAPHICAL_EXAMPLES)
     add_executable(rs-hdr rs-hdr.cpp ../example.hpp)
     set_property(TARGET rs-hdr PROPERTY CXX_STANDARD 11)
     target_link_libraries(rs-hdr ${DEPENDENCIES})
-    include_directories(rs-hdr ../ ../../third-party/tclap/include)
+    include_directories(../ ../../third-party/tclap/include)
     set_target_properties (rs-hdr PROPERTIES FOLDER "Examples")
 
     install(TARGETS rs-hdr RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

diff --git a/examples/hello-realsense/CMakeLists.txt b/examples/hello-realsense/CMakeLists.txt
@@ -8,7 +8,6 @@ project(RealsenseExamplesHelloRealSense)
 add_executable(rs-hello-realsense rs-hello-realsense.cpp)
 set_property(TARGET rs-hello-realsense PROPERTY CXX_STANDARD 11)
 target_link_libraries(rs-hello-realsense ${DEPENDENCIES})
-include_directories(rs-hello-realsense)
 set_target_properties (rs-hello-realsense PROPERTIES FOLDER "Examples")
 
 install(TARGETS rs-hello-realsense RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/examples/measure/CMakeLists.txt b/examples/measure/CMakeLists.txt
@@ -12,7 +12,7 @@ if(BUILD_GRAPHICAL_EXAMPLES)
     add_executable(rs-measure rs-measure.cpp ../example.hpp)
     set_property(TARGET rs-measure PROPERTY CXX_STANDARD 11)
     target_link_libraries(rs-measure ${DEPENDENCIES} Threads::Threads)
-    include_directories(rs-measure ../)
+    include_directories(../)
     set_target_properties (rs-measure PROPERTIES FOLDER "Examples")
 
     install(TARGETS rs-measure RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

diff --git a/examples/multicam/CMakeLists.txt b/examples/multicam/CMakeLists.txt
@@ -8,7 +8,7 @@ project(RealsenseExamplesMulticam)
 if(BUILD_GRAPHICAL_EXAMPLES)
     add_executable(rs-multicam rs-multicam.cpp ../example.hpp)
     set_property(TARGET rs-multicam PROPERTY CXX_STANDARD 11)
-    include_directories(rs-multicam ../)
+    include_directories(../)
     target_link_libraries(rs-multicam ${DEPENDENCIES})
     set_target_properties (rs-multicam PROPERTIES FOLDER Examples)
     install(TARGETS rs-multicam RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

diff --git a/examples/pointcloud/CMakeLists.txt b/examples/pointcloud/CMakeLists.txt
@@ -9,7 +9,7 @@ if(BUILD_GRAPHICAL_EXAMPLES)
     add_executable(rs-pointcloud rs-pointcloud.cpp ../example.hpp)
     set_property(TARGET rs-pointcloud PROPERTY CXX_STANDARD 11)
     target_link_libraries(rs-pointcloud ${DEPENDENCIES})
-    include_directories(rs-pointcloud ../)
+    include_directories(../)
     set_target_properties (rs-pointcloud PROPERTIES FOLDER Examples)
     install(TARGETS rs-pointcloud RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
diff --git a/examples/post-processing/CMakeLists.txt b/examples/post-processing/CMakeLists.txt
@@ -9,7 +9,7 @@ if(BUILD_GRAPHICAL_EXAMPLES)
     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)
     set_property(TARGET rs-post-processing PROPERTY CXX_STANDARD 11)
     target_link_libraries(rs-post-processing ${DEPENDENCIES})
-    include_directories(rs-post-processing ../ ../../third-party/tclap/include ../../third-party/imgui)
+    include_directories(../ ../../third-party/tclap/include ../../third-party/imgui)
     set_target_properties (rs-post-processing PROPERTIES FOLDER "Examples")
     install(TARGETS rs-post-processing RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
diff --git a/examples/record-playback/CMakeLists.txt b/examples/record-playback/CMakeLists.txt
@@ -9,7 +9,7 @@ if(BUILD_GRAPHICAL_EXAMPLES)
     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)
     set_property(TARGET rs-record-playback PROPERTY CXX_STANDARD 11)
     target_link_libraries(rs-record-playback ${DEPENDENCIES})
-    include_directories(rs-record-playback ../ ../../third-party/tclap/include ../../third-party/imgui)
+    include_directories(../ ../../third-party/tclap/include ../../third-party/imgui)
     set_target_properties (rs-record-playback PROPERTIES FOLDER "Examples")
     install(TARGETS rs-record-playback RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
diff --git a/examples/save-to-disk/CMakeLists.txt b/examples/save-to-disk/CMakeLists.txt
@@ -8,6 +8,6 @@ project(RealsenseExamplesSaveToDisk)
 add_executable(rs-save-to-disk rs-save-to-disk.cpp)
 set_property(TARGET rs-save-to-disk PROPERTY CXX_STANDARD 11)
 target_link_libraries(rs-save-to-disk ${DEPENDENCIES})
-include_directories(rs-save-to-disk ../../common ../../third-party ../../third-party/tclap/include)
+include_directories(../../common ../../third-party ../../third-party/tclap/include)
 set_target_properties (rs-save-to-disk PROPERTIES FOLDER "Examples")
 install(TARGETS rs-save-to-disk RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/examples/sensor-control/CMakeLists.txt b/examples/sensor-control/CMakeLists.txt
@@ -9,7 +9,6 @@ if(BUILD_GRAPHICAL_EXAMPLES)
     add_executable(rs-sensor-control api_how_to.h rs-sensor-control.cpp)
     set_property(TARGET rs-sensor-control PROPERTY CXX_STANDARD 11)
     target_link_libraries(rs-sensor-control ${DEPENDENCIES})
-    include_directories(rs-sensor-control)
     set_target_properties (rs-sensor-control PROPERTIES FOLDER Examples)
     install(TARGETS rs-sensor-control RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
diff --git a/examples/software-device/CMakeLists.txt b/examples/software-device/CMakeLists.txt
@@ -12,7 +12,7 @@ if(BUILD_GRAPHICAL_EXAMPLES)
     add_executable(rs-software-device rs-software-device.cpp)
     set_property(TARGET rs-software-device PROPERTY CXX_STANDARD 11)
     target_link_libraries(rs-software-device ${DEPENDENCIES})
-    include_directories(rs-software-device ../ ../../third-party/tclap/include ../../third-party/ ../../common/res)
+    include_directories(../ ../../third-party/tclap/include ../../third-party/ ../../common/res)
     set_target_properties (rs-software-device PROPERTIES FOLDER "Examples")
     install(TARGETS rs-software-device RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
diff --git a/examples/tracking-and-depth/CMakeLists.txt b/examples/tracking-and-depth/CMakeLists.txt
@@ -9,7 +9,7 @@ if(BUILD_GRAPHICAL_EXAMPLES)
     add_executable(rs-tracking-and-depth rs-tracking-and-depth.cpp ../example.hpp)
     set_property(TARGET rs-tracking-and-depth PROPERTY CXX_STANDARD 11)
     target_link_libraries(rs-tracking-and-depth ${DEPENDENCIES})
-    include_directories(rs-tracking-and-depth ../)
+    include_directories(../)
     set_target_properties (rs-tracking-and-depth PROPERTIES FOLDER Examples)
     install(TARGETS rs-tracking-and-depth RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
     add_custom_command(

diff --git a/src/compression/CMakeLists.txt b/src/compression/CMakeLists.txt
@@ -19,7 +19,7 @@ set(COMPRESSION_SOURCES ${COMPRESSION_SOURCES} ${LZ4_DIR}/lz4.h ${LZ4_DIR}/lz4.c
 
 add_library(${PROJECT_NAME} STATIC ${COMPRESSION_SOURCES})
 
-include_directories(${PROJECT_NAME}
+include_directories(
     ../../common
     ../ipDeviceCommon
     ../../third-party/easyloggingpp/src    
@@ -33,7 +33,7 @@ add_dependencies(${PROJECT_NAME}
     libjpeg-turbo
 )
 
-include_directories(${PROJECT_NAME}
+include_directories(
     ${CMAKE_BINARY_DIR}/libjpeg-turbo/include
     ${LZ4_DIR}
 )

diff --git a/tools/benchmark/CMakeLists.txt b/tools/benchmark/CMakeLists.txt
@@ -21,7 +21,7 @@ endif()
 if(BUILD_GRAPHICAL_EXAMPLES)
     add_executable(rs-benchmark rs-benchmark.cpp ../../third-party/glad/glad.c)
     target_link_libraries(rs-benchmark ${DEPENDENCIES} realsense2-gl)
-    include_directories(rs-benchmark ../../third-party/tclap/include ../../third-party/glad)
+    include_directories(../../third-party/tclap/include ../../third-party/glad)
     set_target_properties (rs-benchmark PROPERTIES
         FOLDER Tools
     )

diff --git a/tools/convert/CMakeLists.txt b/tools/convert/CMakeLists.txt
@@ -19,7 +19,7 @@ add_executable(${RS_TARGET} rs-convert.cpp
 )
 set_property(TARGET ${RS_TARGET} PROPERTY CXX_STANDARD 11)
 target_link_libraries(${RS_TARGET} ${DEPENDENCIES} Threads::Threads)
-include_directories(${RS_TARGET} ../../common ../../third-party ../../third-party/tclap/include)
+include_directories(../../common ../../third-party ../../third-party/tclap/include)
 
 set_target_properties (${RS_TARGET} PROPERTIES
     FOLDER "Tools"

diff --git a/tools/data-collect/CMakeLists.txt b/tools/data-collect/CMakeLists.txt
@@ -8,7 +8,7 @@ project(RealsenseToolsDataCollect)
 add_executable(rs-data-collect rs-data-collect.h rs-data-collect.cpp)
 set_property(TARGET rs-data-collect PROPERTY CXX_STANDARD 11)
 target_link_libraries(rs-data-collect ${DEPENDENCIES})
-include_directories(rs-data-collect ../../common ../../third-party/tclap/include)
+include_directories(../../common ../../third-party/tclap/include)
 set_target_properties (rs-data-collect PROPERTIES
     FOLDER "Tools"
 )

diff --git a/tools/depth-quality/CMakeLists.txt b/tools/depth-quality/CMakeLists.txt
@@ -73,12 +73,12 @@ if(BUILD_GRAPHICAL_EXAMPLES)
             depth-metrics.h
             ${COMMON_SRC})
 
-        include_directories(rs-depth-quality ../../common  ../../third-party
-                                             ../../third-party/imgui
-                                             ../../third-party/glad
-                                             ../../third-party/tclap/include
-                                             ../../third-party/tinyfiledialogs
-                                             ${CMAKE_CURRENT_SOURCE_DIR}/res/)
+        include_directories(../../common  ../../third-party
+                            ../../third-party/imgui
+                            ../../third-party/glad
+                            ../../third-party/tclap/include
+                            ../../third-party/tinyfiledialogs
+                            ${CMAKE_CURRENT_SOURCE_DIR}/res/)
 
         #list(TRANSFORM DELAYED PREPEND " /DELAYLOAD:")
         PREPEND(DELAYED " /DELAYLOAD:" ${DELAYED})
@@ -92,11 +92,11 @@ if(BUILD_GRAPHICAL_EXAMPLES)
         ${ELPP_FILES}
         )
 
-        include_directories(rs-depth-quality ../../common  ../../third-party
-                                             ../../third-party/imgui
-                                             ../../third-party/glad
-                                             ../../third-party/tinyfiledialogs
-                                             ../../third-party/tclap/include)
+        include_directories(../../common  ../../third-party
+                            ../../third-party/imgui
+                            ../../third-party/glad
+                            ../../third-party/tinyfiledialogs
+                            ../../third-party/tclap/include)
     endif()
 
     source_group("EasyLogging++" FILES ${ELPP_FILES})

diff --git a/tools/enumerate-devices/CMakeLists.txt b/tools/enumerate-devices/CMakeLists.txt
@@ -8,7 +8,7 @@ project(RealsenseExamplesEnumerateDevices)
 add_executable(rs-enumerate-devices rs-enumerate-devices.cpp)
 set_property(TARGET rs-enumerate-devices PROPERTY CXX_STANDARD 11)
 target_link_libraries(rs-enumerate-devices ${DEPENDENCIES})
-include_directories(rs-enumerate-devices ../../third-party/tclap/include)
+include_directories(../../third-party/tclap/include)
 set_target_properties (rs-enumerate-devices PROPERTIES
     FOLDER Tools
 )

diff --git a/tools/fw-logger/CMakeLists.txt b/tools/fw-logger/CMakeLists.txt
@@ -12,7 +12,7 @@ if(WIN32 OR ANDROID)
 else()
     target_link_libraries(rs-fw-logger -lpthread ${DEPENDENCIES})
 endif()
-include_directories(rs-fw-logger ../../third-party/tclap/include cpp-fw-logger-helpers)
+include_directories(../../third-party/tclap/include cpp-fw-logger-helpers)
 set_target_properties (rs-fw-logger PROPERTIES
     FOLDER Tools
 )

diff --git a/tools/recorder/CMakeLists.txt b/tools/recorder/CMakeLists.txt
@@ -8,7 +8,7 @@ project(RealsenseToolsRecorder)
 add_executable(rs-record rs-record.cpp)
 set_property(TARGET rs-record PROPERTY CXX_STANDARD 11)
 target_link_libraries(rs-record ${DEPENDENCIES})
-include_directories(rs-record ../../common ../../third-party/tclap/include)
+include_directories(../../common ../../third-party/tclap/include)
 set_target_properties (rs-record PROPERTIES
     FOLDER "Tools"
 )

diff --git a/tools/rosbag-inspector/CMakeLists.txt b/tools/rosbag-inspector/CMakeLists.txt
@@ -26,11 +26,11 @@ if(BUILD_GRAPHICAL_EXAMPLES)
     if(WIN32)
         add_executable(rs-rosbag-inspector WIN32 ${RS_ROSBAG_INSPECTOR_CPP})
 
-        include_directories(rs-rosbag-inspector ../../third-party/imgui ../../common ../../third-party/glad 
+        include_directories(../../third-party/imgui ../../common ../../third-party/glad 
                                              ../../third-party/tinyfiledialogs ../../third-party ${CMAKE_CURRENT_SOURCE_DIR}/res/)
     else()
         add_executable(rs-rosbag-inspector ${RS_ROSBAG_INSPECTOR_CPP})
-        include_directories(rs-rosbag-inspector ../../third-party/imgui ../../common ../../third-party/glad 
+        include_directories(../../third-party/imgui ../../common ../../third-party/glad 
                                              ../../third-party/tinyfiledialogs ../../third-party)
     endif()
     set_property(TARGET rs-rosbag-inspector PROPERTY CXX_STANDARD 11)

diff --git a/tools/rs-server/CMakeLists.txt b/tools/rs-server/CMakeLists.txt
@@ -36,7 +36,7 @@ else()
   add_executable(${PROJECT_NAME} ${RS_SERVER_SOURCES})
   add_definitions(-DELPP_NO_DEFAULT_LOG_FILE)
 
-  include_directories(${PROJECT_NAME}
+  include_directories(
     ../../common
     ../../src/ipDeviceCommon
     ../../include/librealsense2

diff --git a/tools/terminal/CMakeLists.txt b/tools/terminal/CMakeLists.txt
@@ -12,7 +12,7 @@ if(WIN32 OR ANDROID)
 else()
     target_link_libraries(rs-terminal -lpthread ${DEPENDENCIES})
 endif()
-include_directories(rs-terminal ../../common ../../third-party ../../third-party/tclap/include)
+include_directories(../../common ../../third-party ../../third-party/tclap/include)
 set_target_properties (rs-terminal PROPERTIES
     FOLDER Tools
 )

diff --git a/unit-tests/internal/CMakeLists.txt b/unit-tests/internal/CMakeLists.txt
@@ -20,7 +20,7 @@ set (INTERNAL_TESTS_SOURCES
 add_executable(${PROJECT_NAME} ${INTERNAL_TESTS_SOURCES})
 set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)
 target_link_libraries(${PROJECT_NAME} ${DEPENDENCIES})
-include_directories(${PROJECT_NAME} ../ ../../src/)
+include_directories(../ ../../src/)
 set_target_properties (${PROJECT_NAME} PROPERTIES FOLDER "Unit-Tests")
 
 if(UNIX)