diff --git a/src/gl/CMakeLists.txt b/src/gl/CMakeLists.txt index 9783b48286..e1d28861b9 100644 --- a/src/gl/CMakeLists.txt +++ b/src/gl/CMakeLists.txt @@ -33,6 +33,13 @@ set(REALSENSE_GL_CPP ${LZ4_DIR}/lz4.c ) +set(REALSENSE_GL_PUBLIC_HEADERS + ../../include/librealsense2-gl/rs_processing_gl.h + ../../include/librealsense2-gl/rs_processing_gl.hpp +) + +set(CMAKECONFIG_GL_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${LRS_GL_TARGET}") + include(${CMAKE_SOURCE_DIR}/CMake/opengl_config.cmake) if (${BUILD_SHARED_LIBS} AND ${BUILD_EASYLOGGINGPP}) @@ -62,16 +69,17 @@ target_include_directories(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/../../common PUBLIC $ - $ + $ ) set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER Library) +set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${REALSENSE_GL_PUBLIC_HEADERS}") set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${REALSENSE_VERSION_STRING} SOVERSION "${REALSENSE_VERSION_MAJOR}.${REALSENSE_VERSION_MINOR}") write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/realsense2-glConfigVersion.cmake" VERSION ${REALSENSE_VERSION_STRING} COMPATIBILITY AnyNewerVersion) configure_package_config_file(../../CMake/realsense2-glConfig.cmake.in realsense2-glConfig.cmake - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} + INSTALL_DESTINATION ${CMAKECONFIG_GL_INSTALL_DIR} INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/bin PATH_VARS CMAKE_INSTALL_INCLUDEDIR ) @@ -90,21 +98,21 @@ install(TARGETS ${LRS_GL_TARGET} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_PREFIX}/include/librealsense2" + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_PREFIX}/include/librealsense2-gl" ) install(EXPORT realsense2-glTargets FILE realsense2-glTargets.cmake NAMESPACE ${LRS_GL_TARGET}:: - DESTINATION ${CMAKECONFIG_INSTALL_DIR} + DESTINATION ${CMAKECONFIG_GL_INSTALL_DIR} ) install(FILES "${CMAKE_BINARY_DIR}/src/gl/realsense2-glConfig.cmake" - DESTINATION ${CMAKECONFIG_INSTALL_DIR} + DESTINATION ${CMAKECONFIG_GL_INSTALL_DIR} ) install(FILES "${CMAKE_BINARY_DIR}/src/gl/realsense2-glConfigVersion.cmake" - DESTINATION ${CMAKECONFIG_INSTALL_DIR} + DESTINATION ${CMAKECONFIG_GL_INSTALL_DIR} ) # Set library pkgconfig file for facilitating 3rd party integration diff --git a/src/usbhost/usbhost.h b/src/usbhost/usbhost.h index ca9f131377..cdc5151a4a 100644 --- a/src/usbhost/usbhost.h +++ b/src/usbhost/usbhost.h @@ -21,6 +21,7 @@ extern "C" { #endif +#include #include #include diff --git a/wrappers/opencv/latency-tool/readme.md b/wrappers/opencv/latency-tool/readme.md index a03a50a782..44b4ff6ee4 100644 --- a/wrappers/opencv/latency-tool/readme.md +++ b/wrappers/opencv/latency-tool/readme.md @@ -34,6 +34,7 @@ Once it detects bits and decodes the clock value embedded in the image, the samp To make sure expensive detection logic is not preventing us from getting the frames in time, detection is being done on a seperate thread. Frames are being passed to this thread, alongside their respective clock measurements, using a concurrent queue. We ensure that the queue will not spill, by emptying it after each successful or unsuccessful detection attempt. +Please refer to [Frame Buffer Management](https://github.com/IntelRealSense/librealsense/wiki/Frame-Buffering-Management-in-RealSense-SDK-2.0) for further information. ## Controlling the Demo