channels/urbdrc: fix cmake scripts

diff --git a/channels/urbdrc/CMakeLists.txt b/channels/urbdrc/CMakeLists.txt
index 4a59f7b..2e10bd8 100644 (file)
--- a/channels/urbdrc/CMakeLists.txt
+++ b/channels/urbdrc/CMakeLists.txt
@@ -17,6 +17,20 @@
 
 define_channel("urbdrc")
 
+if(NOT WIN32)
+       find_package(UDev)
+       find_package(UUID)
+       find_package(DbusGlib)
+       find_package(libusb-1.0)
+endif()
+
+if(UDEV_FOUND AND UUID_FOUND AND DBUS_GLIB_FOUND AND LIBUSB_1_FOUND)
+       set(URBDRC_DEPENDENCIES_FOUND TRUE)
+       message(STATUS "Found all URBDRC dependencies")
+endif()
+
 if(WITH_CLIENT_CHANNELS)
-       add_channel_client(${MODULE_PREFIX} ${CHANNEL_NAME})
+       if(URBDRC_DEPENDENCIES_FOUND)
+               add_channel_client(${MODULE_PREFIX} ${CHANNEL_NAME})
+       endif()
 endif()

diff --git a/channels/urbdrc/client/CMakeLists.txt b/channels/urbdrc/client/CMakeLists.txt
index 14f62b8..7af1372 100644 (file)
--- a/channels/urbdrc/client/CMakeLists.txt
+++ b/channels/urbdrc/client/CMakeLists.txt
@@ -31,10 +31,6 @@ set(${MODULE_PREFIX}_SRCS
 
 include_directories(..)
 
-find_package(UDev REQUIRED)
-find_package(UUID REQUIRED)
-find_package(DbusGlib REQUIRED)
-
 add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")
 
 set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")

diff --git a/channels/urbdrc/client/libusb/CMakeLists.txt b/channels/urbdrc/client/libusb/CMakeLists.txt
index 47688b9..49386f4 100644 (file)
--- a/channels/urbdrc/client/libusb/CMakeLists.txt
+++ b/channels/urbdrc/client/libusb/CMakeLists.txt
@@ -27,8 +27,6 @@ set(${MODULE_PREFIX}_SRCS
 
 include_directories(..)
 
-find_package(libusb-1.0 REQUIRED)
-
 add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "")
 
 set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")
@@ -37,10 +35,9 @@ set(${MODULE_PREFIX}_LIBS
        ${CMAKE_THREAD_LIBS_INIT})
 
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS}
-    ${DBUS_GLIB_LIBRARIES}
-    ${UUID_LIBRARIES}
-    ${LIBUSB_1_LIBRARIES}
-    )
+       ${DBUS_GLIB_LIBRARIES}
+       ${UUID_LIBRARIES}
+       ${LIBUSB_1_LIBRARIES})
 
 set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
        MONOLITHIC ${MONOLITHIC_BUILD}
@@ -49,6 +46,5 @@ set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
 
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
-if(NOT STATIC_CHANNELS)
-       install(TARGETS ${MODULE_NAME} DESTINATION ${FREERDP_ADDIN_PATH})
-endif()
+install(TARGETS ${MODULE_NAME} DESTINATION ${FREERDP_ADDIN_PATH} EXPORT FreeRDPTargets)
+

diff --git a/cmake/FindDbusGlib.cmake b/cmake/FindDbusGlib.cmake
index 95c64e4..304860a 100644 (file)
--- a/cmake/FindDbusGlib.cmake
+++ b/cmake/FindDbusGlib.cmake
@@ -35,4 +35,8 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(dbus-glib  DEFAULT_MSG
                                   DBUS_GLIB_LIBRARY DBUS_GLIB_INCLUDE_DIR)
 
-mark_as_advanced(DBUS_GLIB_INCLUDE_DIR DBUS_GLIB_LIBRARY )
+if(DBUS_GLIB_LIBRARIES AND DBUS_GLIB_INCLUDE_DIRS)
+          set(DBUS_GLIB_FOUND TRUE)
+endif()
+                                  
+mark_as_advanced(DBUS_GLIB_INCLUDE_DIR DBUS_GLIB_LIBRARY)