Skip to content

Commit

Permalink
Disable TM2 build as conflict with NCS1
Browse files Browse the repository at this point in the history
NCS1 is reset by realsense-viewer since TM2 device has the same VID/PID with NCS1. Workaround is to build realsense-viewer tool without "BUILD_WITH_TM2". Fix issue: IntelRealSense#2924
  • Loading branch information
yechun1 authored and sharronliu committed Apr 20, 2020
1 parent 24c6634 commit aa60c68
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,18 @@ endif()
# set library version
set_target_properties(${LRS_TARGET} PROPERTIES VERSION ${REALSENSE_VERSION_STRING} SOVERSION "${REALSENSE_VERSION_MAJOR}.${REALSENSE_VERSION_MINOR}")

# NCS1 is reset by realsense-viewer since TM2 device has the same VID/PID with NCS1.
# Workaround is to build realsense-viewer tool without "BUILD_WITH_TM2".
# Fix issue: https://github.com/IntelRealSense/librealsense/issues/2924
if(${ROS_BUILD_TYPE})
set(BUILD_WITH_TM2 OFF)
endif()

# Checking Internet connection, as TM2 needs to download the FW from amazon cloud
if(BUILD_WITH_TM2)
include(CMake/tm2_connectivity_check.cmake)
endif()

include(include/CMakeLists.txt)
include(src/CMakeLists.txt)
include(third-party/CMakeLists.txt)
Expand Down

0 comments on commit aa60c68

Please sign in to comment.