From 75ab468980dc68b6479b453f78c4187bbc6da2b4 Mon Sep 17 00:00:00 2001
From: "Katz, Matan" <matan.katz@intel.com>
Date: Mon, 4 Nov 2019 15:31:56 +0200
Subject: [PATCH] fix UVC cmake option deprecation

---
 CMake/global_config.cmake | 5 -----
 CMakeLists.txt            | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CMake/global_config.cmake b/CMake/global_config.cmake
index e9afe03930..0cdc7485b9 100644
--- a/CMake/global_config.cmake
+++ b/CMake/global_config.cmake
@@ -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})
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c560e367f8..16ced1bbc8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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")