GLSL Processing Blocks

.gitignore

@@ -4,8 +4,12 @@ lib/
 ubuntu-xenial/
 ubuntu-xenial-hwe/
 
+# Docs
+doc/doxygen/html/
+*.html.lnk
+
 # CMake
-build/
+build*/
 connectivity_check
 
 # XCode
@@ -83,4 +87,3 @@ librealsense-log.txt
 *.json
 *.ini
 *.cxx
-

CMake/android_config.cmake

@@ -23,8 +23,6 @@ macro(os_set_flags)
     else()
         set(FORCE_LIBUVC ON)
         set(BACKEND RS2_USE_V4L2_BACKEND)
-        include(CMake/external_libusb.cmake)
-        set(LIBUSB1_LIBRARIES ${LIBUSB1_LIBRARIES} log)
     endif()
 endmacro()
 
@@ -33,10 +31,4 @@ macro(os_target_config)
         find_library(log-lib log)
         target_link_libraries(${LRS_TARGET} PRIVATE log)
     endif()
-
-    if(NOT ANDROID_USB_HOST_UVC)
-        add_dependencies(${LRS_TARGET} libusb)
-    endif()
-
-    target_link_libraries(${LRS_TARGET} PRIVATE ${LIBUSB1_LIBRARIES})
 endmacro()

CMake/external_libusb.cmake

@@ -1,13 +1,12 @@
-message(STATUS "Use external libusb")
 include(ExternalProject)
 
 ExternalProject_Add(
     libusb
 
     GIT_REPOSITORY "https://github.com/libusb/libusb.git"
-    GIT_TAG "v1.0.22"
+    GIT_TAG "2a7372db54094a406a755f0b8548b614ba8c78ec" # "v1.0.22" + Mac get_device_list hang fix
 
-    UPDATE_COMMAND ${CMAKE_COMMAND} -E copy
+    UPDATE_COMMAND ${CMAKE_COMMAND} -E copy_if_different
             ${CMAKE_CURRENT_SOURCE_DIR}/third-party/libusb/CMakeLists.txt
             ${CMAKE_CURRENT_BINARY_DIR}/third-party/libusb/CMakeLists.txt
     PATCH_COMMAND ""
@@ -20,13 +19,16 @@ ExternalProject_Add(
             -DANDROID_STL=${ANDROID_STL}
             -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/libusb_install
     TEST_COMMAND ""
+    BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/libusb_install/lib/${CMAKE_STATIC_LIBRARY_PREFIX}usb${CMAKE_STATIC_LIBRARY_SUFFIX}
 )
 
-set(LIBUSB1_LIBRARY_DIRS ${CMAKE_CURRENT_BINARY_DIR}/libusb_install/lib)
-link_directories(${LIBUSB1_LIBRARY_DIRS})
+add_library(usb INTERFACE)
+target_include_directories(usb INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/third-party/libusb/libusb>)
+target_link_libraries(usb INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/libusb_install/lib/${CMAKE_STATIC_LIBRARY_PREFIX}usb${CMAKE_STATIC_LIBRARY_SUFFIX})
+set(USE_EXTERNAL_USB ON) # INTERFACE libraries can't have real deps, so targets that link with usb need to also depend on libusb
 
-set(LIBUSB1_LIBRARIES usb)
-#set(LIBUSB_LOCAL_INCLUDE_PATH third-party/libusb)
-
-set(USE_EXTERNAL_USB ON)
-set(LIBUSB_LOCAL_INCLUDE_PATH ${CMAKE_CURRENT_BINARY_DIR}/third-party/libusb)
+if (APPLE)
+  find_library(corefoundation_lib CoreFoundation)
+  find_library(iokit_lib IOKit)
+  target_link_libraries(usb INTERFACE objc ${corefoundation_lib} ${iokit_lib})
+endif()

CMake/global_config.cmake

@@ -1,5 +1,6 @@
 # Save the command line compile commands in the build output
 set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
+set(CMAKE_CXX_STANDARD 11)
 # View the makefile commands during build
 #set(CMAKE_VERBOSE_MAKEFILE on)
 
@@ -50,7 +51,7 @@ macro(global_set_flags)
 
     if(FORCE_LIBUVC)
         set(BACKEND RS2_USE_LIBUVC_BACKEND)
-        message( WARNING "Using libuvc!" )
+        message(STATUS "Using libuvc (by force)")
     endif()
 
     if (BUILD_WITH_CUDA)
@@ -61,7 +62,7 @@ macro(global_set_flags)
 endmacro()
 
 macro(global_target_config)
-    target_link_libraries(${LRS_TARGET} PRIVATE realsense-file ${CMAKE_THREAD_LIBS_INIT} ${TRACKING_DEVICE_LIBS})
+    target_link_libraries(${LRS_TARGET} PRIVATE realsense-file ${CMAKE_THREAD_LIBS_INIT})
 
     include_directories(${LRS_TARGET} src)
 
@@ -83,10 +84,10 @@ endmacro()
 macro(add_tm2)
     message(STATUS "Building with TM2")
     add_subdirectory(third-party/libtm)
+    include(libusb_config)
     if(USE_EXTERNAL_USB)
         add_dependencies(tm libusb)
     endif()
     target_compile_definitions(${LRS_TARGET} PRIVATE WITH_TRACKING=1 BUILD_STATIC=1)
-    target_link_libraries(${LRS_TARGET} PRIVATE tm ${CMAKE_THREAD_LIBS_INIT} ${TRACKING_DEVICE_LIBS})
-    target_include_directories(${LRS_TARGET} PRIVATE third-party/libtm/libtm/include)
+    target_link_libraries(${LRS_TARGET} PRIVATE tm ${CMAKE_THREAD_LIBS_INIT})
 endmacro()

CMake/include_os.cmake

@@ -1,11 +1,7 @@
-    if (WIN32)
-        include(CMake/windows_config.cmake)
-    endif()
-
-    if(UNIX)
-        include(CMake/unix_config.cmake)
-    endif()
-
-    if(ANDROID_NDK_TOOLCHAIN_INCLUDED)
-        include(CMake/android_config.cmake)
-    endif()
+if(ANDROID_NDK_TOOLCHAIN_INCLUDED)
+   include(CMake/android_config.cmake)
+elseif (WIN32)
+   include(CMake/windows_config.cmake)
+else()
+   include(CMake/unix_config.cmake)
+endif()

CMake/libusb_config.cmake

@@ -0,0 +1,14 @@
+if (NOT TARGET usb)
+    find_library(LIBUSB_LIB usb-1.0)
+    find_path(LIBUSB_INC libusb.h HINTS PATH_SUFFIXES libusb-1.0)
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(usb "libusb not found; using internal version" LIBUSB_LIB LIBUSB_INC)
+    if (USB_FOUND)
+        add_library(usb INTERFACE)
+        target_include_directories(usb INTERFACE ${LIBUSB_INC})
+        target_link_libraries(usb INTERFACE ${LIBUSB_LIB})
+    else()
+        include(CMake/external_libusb.cmake)
+    endif()
+    install(TARGETS usb EXPORT realsense2Targets)
+endif()

CMake/unix_config.cmake

@@ -6,8 +6,6 @@ macro(os_set_flags)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -pedantic -g -Wno-missing-field-initializers")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-switch -Wno-multichar -Wsequence-point -Wformat-security")
 
-    add_definitions(-DUSE_SYSTEM_LIBUSB)
-
     execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpmachine OUTPUT_VARIABLE MACHINE)
     if(${MACHINE} MATCHES "arm-linux-gnueabihf")
         set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -mfpu=neon -mfloat-abi=hard -ftree-vectorize")
@@ -33,20 +31,4 @@ macro(os_set_flags)
 endmacro()
 
 macro(os_target_config)
-    find_package(PkgConfig)
-    if(NOT PKG_CONFIG_FOUND)
-        message(FATAL_ERROR "\n\n PkgConfig package is missing!\n\n")
-    endif()
-
-    pkg_search_module(LIBUSB1 REQUIRED libusb-1.0)
-    if(LIBUSB1_FOUND)
-        include_directories(SYSTEM ${LIBUSB1_INCLUDE_DIRS})
-        link_directories(${LIBUSB1_LIBRARY_DIRS})
-        list(APPEND librealsense_PKG_DEPS "libusb-1.0")
-    else()
-        message( FATAL_ERROR "Failed to find libusb-1.0" )
-    endif(LIBUSB1_FOUND)
-
-    target_include_directories(${LRS_TARGET} PRIVATE ${LIBUSB1_INCLUDE_DIRS})
-    target_link_libraries(${LRS_TARGET} PRIVATE ${LIBUSB1_LIBRARIES})
 endmacro()