From 2360d12e6d8a13979c7ff71362fdbaf8fdd68b28 Mon Sep 17 00:00:00 2001
From: Chris Ye <chris.ye@intel.com>
Date: Thu, 27 Dec 2018 14:57:32 +0800
Subject: [PATCH] Disable TM2 build as conflict with NCS1

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
---
 CMakeLists.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0b7ea4311..6302b9a164 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,6 +66,13 @@ if(${ROS_BUILD_TYPE})
     set(BUILD_WITH_TM2 OFF)
 endif()
 
+# 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)