Skip to content

Commit

Permalink
Merge pull request IntelRealSense#5180 from matkatz/uvc-cmake-options…
Browse files Browse the repository at this point in the history
…-fix

UVC CMake options fix
  • Loading branch information
ev-mp authored Nov 5, 2019
2 parents 767a800 + 75ab468 commit 9f99fa9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
5 changes: 0 additions & 5 deletions CMake/global_config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@ if(ENABLE_CCACHE)
endif()

macro(global_set_flags)
if(${FORCE_LIBUVC} OR ${FORCE_WINUSB_UVC} OR ${ANDROID_USB_HOST_UVC})
MESSAGE(DEPRECATION "FORCE_LIBUVC, FORCE_WINUSB_UVC and ANDROID_USB_HOST_UVC are deprecated, use FORCE_RSUSB_BACKEND instead")
set(FORCE_RSUSB_BACKEND ON)
endif()

set(LRS_TARGET realsense2)
set(LRS_LIB_NAME ${LRS_TARGET})

Expand Down
6 changes: 6 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ project(librealsense2 LANGUAGES CXX C)
include(CMake/lrs_options.cmake)
include(CMake/connectivity_check.cmake)

#Deprecation message, should be removed in future releases
if(${FORCE_LIBUVC} OR ${FORCE_WINUSB_UVC} OR ${ANDROID_USB_HOST_UVC})
MESSAGE(DEPRECATION "FORCE_LIBUVC, FORCE_WINUSB_UVC and ANDROID_USB_HOST_UVC are deprecated, use FORCE_RSUSB_BACKEND instead")
set(FORCE_RSUSB_BACKEND ON)
endif()

# Checking Internet connection, as TM2 needs to download the FW from amazon cloud
if(BUILD_WITH_TM2 AND NOT INTERNET_CONNECTION)
message(WARNING "No internet connection, disabling BUILD_WITH_TM2")
Expand Down

0 comments on commit 9f99fa9

Please sign in to comment.