Merge pull request #1389

2013-08-26 14:53:40 +02:00 · 2013-08-26 14:53:40 +02:00 · deb9d2bc8e
commit deb9d2bc8e
parent f25f2e6055 b6d06ec012
7 changed files with 388 additions and 6 deletions
--- a/channels/urbdrc/client/CMakeLists.txt
+++ b/channels/urbdrc/client/CMakeLists.txt
@ -31,6 +31,10 @@ 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 "")
@ -38,9 +42,9 @@ set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")
 #set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} libusb-devman)

 set(${MODULE_PREFIX}_LIBS
-	dbus-glib-1
-	udev
-	uuid)
+    ${DBUS_GLIB_LIBRARIES}
+    ${UDEV_LIBRARIES}
+    ${UUID_LIBRARIES})

 set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
 	MONOLITHIC ${MONOLITHIC_BUILD}
--- a/channels/urbdrc/client/libusb/CMakeLists.txt
+++ b/channels/urbdrc/client/libusb/CMakeLists.txt
@ -27,6 +27,8 @@ 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 "")
@ -35,9 +37,10 @@ set(${MODULE_PREFIX}_LIBS
 	${CMAKE_THREAD_LIBS_INIT})

 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS}
-	dbus-glib-1
-	usb-1.0
-	udev)
+    ${DBUS_GLIB_LIBRARIES}
+    ${UUID_LIBRARIES}
+    ${LIBUSB_1_LIBRARIES}
+    )

 set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
 	MONOLITHIC ${MONOLITHIC_BUILD}
--- a/cmake/FindDBus.cmake
+++ b/cmake/FindDBus.cmake
@ -0,0 +1,73 @@
+# - Try to find the low-level D-Bus library
+# Once done this will define
+#
+#  DBUS_FOUND - system has D-Bus
+#  DBUS_INCLUDE_DIR - the D-Bus include directory
+#  DBUS_ARCH_INCLUDE_DIR - the D-Bus architecture-specific include directory
+#  DBUS_LIBRARIES - the libraries needed to use D-Bus
+
+# Copyright (c) 2008, Kevin Kofler, <kevin.kofler@chello.at>
+# modeled after FindLibArt.cmake:
+# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+if (DBUS_INCLUDE_DIR AND DBUS_ARCH_INCLUDE_DIR AND DBUS_LIBRARIES)
+
+  # in cache already
+  SET(DBUS_FOUND TRUE)
+
+else (DBUS_INCLUDE_DIR AND DBUS_ARCH_INCLUDE_DIR AND DBUS_LIBRARIES)
+
+  IF (NOT WIN32)
+    FIND_PACKAGE(PkgConfig)
+    IF (PKG_CONFIG_FOUND)
+      # use pkg-config to get the directories and then use these values
+      # in the FIND_PATH() and FIND_LIBRARY() calls
+      pkg_check_modules(_DBUS_PC QUIET dbus-1)
+    ENDIF (PKG_CONFIG_FOUND)
+  ENDIF (NOT WIN32)
+
+  FIND_PATH(DBUS_INCLUDE_DIR dbus/dbus.h
+    ${_DBUS_PC_INCLUDE_DIRS}
+    /usr/include
+    /usr/include/dbus-1.0
+    /usr/local/include
+  )
+
+  FIND_PATH(DBUS_ARCH_INCLUDE_DIR dbus/dbus-arch-deps.h
+    ${_DBUS_PC_INCLUDE_DIRS}
+    /usr/lib${LIB_SUFFIX}/include
+    /usr/lib${LIB_SUFFIX}/dbus-1.0/include
+    /usr/lib64/include
+    /usr/lib64/dbus-1.0/include
+    /usr/lib/include
+    /usr/lib/dbus-1.0/include
+  )
+
+  FIND_LIBRARY(DBUS_LIBRARIES NAMES dbus-1 dbus
+    PATHS
+     ${_DBUS_PC_LIBDIR}
+  )
+
+
+  if (DBUS_INCLUDE_DIR AND DBUS_ARCH_INCLUDE_DIR AND DBUS_LIBRARIES)
+     set(DBUS_FOUND TRUE)
+  endif (DBUS_INCLUDE_DIR AND DBUS_ARCH_INCLUDE_DIR AND DBUS_LIBRARIES)
+
+
+  if (DBUS_FOUND)
+     if (NOT DBus_FIND_QUIETLY)
+        message(STATUS "Found D-Bus: ${DBUS_LIBRARIES}")
+     endif (NOT DBus_FIND_QUIETLY)
+  else (DBUS_FOUND)
+     if (DBus_FIND_REQUIRED)
+        message(FATAL_ERROR "Could NOT find D-Bus")
+     endif (DBus_FIND_REQUIRED)
+  endif (DBUS_FOUND)
+
+  MARK_AS_ADVANCED(DBUS_INCLUDE_DIR DBUS_ARCH_INCLUDE_DIR DBUS_LIBRARIES)
+
+endif (DBUS_INCLUDE_DIR AND DBUS_ARCH_INCLUDE_DIR AND DBUS_LIBRARIES)
+  
--- a/cmake/FindDbusGlib.cmake
+++ b/cmake/FindDbusGlib.cmake
@ -0,0 +1,38 @@
+# DbusGlib library detection
+#
+# Copyright 2013 Thinstuff Technologies GmbH
+# Copyright 2013 Armin Novak <anovak@thinstuff.at>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+find_package(PkgConfig)
+pkg_check_modules(PC_DBUS_GLIB QUIET dbus-glib-1)
+set(DBUS_GLIB_DEFINITIONS ${PC_DBUS_GLIB_CFLAGS_OTHER})
+
+find_path(DBUS_GLIB_INCLUDE_DIR dbus/dbus-glib.h
+          HINTS ${PC_DBUS_GLIB_INCLUDEDIR} ${PC_DBUS_GLIB_INCLUDE_DIRS}
+          PATH_SUFFIXES dbus-glib-1 )
+
+find_library(DBUS_GLIB_LIBRARY NAMES dbus-glib-1 dbus-glib
+             HINTS ${PC_DBUS_GLIB_LIBDIR} ${PC_DBUS_GLIB_LIBRARY_DIRS} )
+
+set(DBUS_GLIB_LIBRARIES ${DBUS_GLIB_LIBRARY} )
+set(DBUS_GLIB_INCLUDE_DIRS ${DBUS_GLIB_INCLUDE_DIR} )
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set DBUS_GLIB_FOUND to TRUE
+# if all listed variables are TRUE
+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 )
--- a/cmake/FindUDev.cmake
+++ b/cmake/FindUDev.cmake
@ -0,0 +1,53 @@
+# razor-de: Configure libudev environment
+#
+# UDEV_FOUND - system has a libudev
+# UDEV_INCLUDE_DIR - where to find header files
+# UDEV_LIBRARIES - the libraries to link against udev
+# UDEV_STABLE - it's true when is the version greater or equals to 143 - version when the libudev was stabilized in its API
+#
+# copyright (c) 2011 Petr Vanek <petr@scribus.info>
+# Redistribution and use is allowed according to the terms of the BSD license.
+#
+
+FIND_PATH(
+    UDEV_INCLUDE_DIR
+    libudev.h
+    /usr/include
+    /usr/local/include
+    ${UDEV_PATH_INCLUDES}
+)
+
+FIND_LIBRARY(
+    UDEV_LIBRARIES
+    NAMES udev libudev
+    PATHS
+        /usr/lib${LIB_SUFFIX}
+        /usr/local/lib${LIB_SUFFIX}
+        ${UDEV_PATH_LIB}
+)
+
+IF (UDEV_LIBRARIES AND UDEV_INCLUDE_DIR)
+    SET(UDEV_FOUND "YES")
+    execute_process(COMMAND pkg-config --atleast-version=143 libudev RESULT_VARIABLE UDEV_STABLE)
+    # retvale is 0 of the condition is "true" so we need to negate the value...
+    if (UDEV_STABLE)
+set(UDEV_STABLE 0)
+    else (UDEV_STABLE)
+set(UDEV_STABLE 1)
+    endif (UDEV_STABLE)
+    message(STATUS "libudev stable: ${UDEV_STABLE}")
+ENDIF (UDEV_LIBRARIES AND UDEV_INCLUDE_DIR)
+
+IF (UDEV_FOUND)
+    MESSAGE(STATUS "Found UDev: ${UDEV_LIBRARIES}")
+    MESSAGE(STATUS " include: ${UDEV_INCLUDE_DIR}")
+ELSE (UDEV_FOUND)
+    MESSAGE(STATUS "UDev not found.")
+    MESSAGE(STATUS "UDev: You can specify includes: -DUDEV_PATH_INCLUDES=/opt/udev/include")
+    MESSAGE(STATUS " currently found includes: ${UDEV_INCLUDE_DIR}")
+    MESSAGE(STATUS "UDev: You can specify libs: -DUDEV_PATH_LIB=/opt/udev/lib")
+    MESSAGE(STATUS " currently found libs: ${UDEV_LIBRARIES}")
+    IF (UDev_FIND_REQUIRED)
+        MESSAGE(FATAL_ERROR "Could not find UDev library")
+    ENDIF (UDev_FIND_REQUIRED)
+ENDIF (UDEV_FOUND)
--- a/cmake/FindUUID.cmake
+++ b/cmake/FindUUID.cmake
@ -0,0 +1,113 @@
+# - Try to find UUID
+# Once done this will define
+#
+# UUID_FOUND - system has UUID
+# UUID_INCLUDE_DIRS - the UUID include directory
+# UUID_LIBRARIES - Link these to use UUID
+# UUID_DEFINITIONS - Compiler switches required for using UUID
+#
+# Copyright (c) 2006 Andreas Schneider <mail@cynapses.org>
+#
+# Redistribution and use is allowed according to the terms of the New
+# BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+
+if (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
+# in cache already
+set(UUID_FOUND TRUE)
+else (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
+find_path(UUID_INCLUDE_DIR
+NAMES
+uuid/uuid.h
+PATHS
+${UUID_DIR}/include
+$ENV{UUID_DIR}/include
+$ENV{UUID_DIR}
+${DELTA3D_EXT_DIR}/inc
+$ENV{DELTA_ROOT}/ext/inc
+$ENV{DELTA_ROOT}
+~/Library/Frameworks
+/Library/Frameworks
+/usr/local/include
+/usr/include
+/usr/include/gdal
+/sw/include # Fink
+/opt/local/include # DarwinPorts
+/opt/csw/include # Blastwave
+/opt/include
+[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
+/usr/freeware/include
+
+)
+
+find_library(UUID_LIBRARY
+NAMES
+uuid
+PATHS
+${UUID_DIR}/lib
+$ENV{UUID_DIR}/lib
+$ENV{UUID_DIR}
+${DELTA3D_EXT_DIR}/lib
+$ENV{DELTA_ROOT}/ext/lib
+$ENV{DELTA_ROOT}
+$ENV{OSG_ROOT}/lib
+~/Library/Frameworks
+/Library/Frameworks
+/usr/local/lib
+/usr/lib
+/sw/lib
+/opt/local/lib
+/opt/csw/lib
+/opt/lib
+/usr/freeware/lib64
+)
+
+find_library(UUID_LIBRARY_DEBUG
+NAMES
+uuidd
+PATHS
+${UUID_DIR}/lib
+$ENV{UUID_DIR}/lib
+$ENV{UUID_DIR}
+${DELTA3D_EXT_DIR}/lib
+$ENV{DELTA_ROOT}/ext/lib
+$ENV{DELTA_ROOT}
+$ENV{OSG_ROOT}/lib
+~/Library/Frameworks
+/Library/Frameworks
+/usr/local/lib
+/usr/lib
+/sw/lib
+/opt/local/lib
+/opt/csw/lib
+/opt/lib
+/usr/freeware/lib64
+)
+
+set(UUID_INCLUDE_DIRS
+${UUID_INCLUDE_DIR}
+)
+set(UUID_LIBRARIES
+${UUID_LIBRARY}
+)
+
+if (UUID_INCLUDE_DIRS AND UUID_LIBRARIES)
+set(UUID_FOUND TRUE)
+endif (UUID_INCLUDE_DIRS AND UUID_LIBRARIES)
+
+if (UUID_FOUND)
+if (NOT UUID_FIND_QUIETLY)
+message(STATUS "Found UUID: ${UUID_LIBRARIES}")
+endif (NOT UUID_FIND_QUIETLY)
+else (UUID_FOUND)
+if (UUID_FIND_REQUIRED)
+message(FATAL_ERROR "Could not find UUID")
+endif (UUID_FIND_REQUIRED)
+endif (UUID_FOUND)
+
+# show the UUID_INCLUDE_DIRS and UUID_LIBRARIES variables only in the advanced view
+mark_as_advanced(UUID_INCLUDE_DIRS UUID_LIBRARIES)
+
+endif (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
--- a/cmake/Findlibusb-1.0.cmake
+++ b/cmake/Findlibusb-1.0.cmake
@ -0,0 +1,98 @@
+# - Try to find libusb-1.0
+# Once done this will define
+#
+# LIBUSB_1_FOUND - system has libusb
+# LIBUSB_1_INCLUDE_DIRS - the libusb include directory
+# LIBUSB_1_LIBRARIES - Link these to use libusb
+# LIBUSB_1_DEFINITIONS - Compiler switches required for using libusb
+#
+# Adapted from cmake-modules Google Code project
+#
+# Copyright (c) 2006 Andreas Schneider <mail@cynapses.org>
+#
+# (Changes for libusb) Copyright (c) 2008 Kyle Machulis <kyle@nonpolynomial.com>
+#
+# Redistribution and use is allowed according to the terms of the New BSD license.
+#
+# CMake-Modules Project New BSD License
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# * Neither the name of the CMake-Modules Project nor the names of its
+# contributors may be used to endorse or promote products derived from this
+# software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+
+if (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)
+  # in cache already
+  set(LIBUSB_FOUND TRUE)
+else (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)
+  find_path(LIBUSB_1_INCLUDE_DIR
+    NAMES
+libusb.h
+    PATHS
+      /usr/include
+      /usr/local/include
+      /opt/local/include
+      /sw/include
+PATH_SUFFIXES
+libusb-1.0
+  )
+
+  find_library(LIBUSB_1_LIBRARY
+    NAMES
+      usb-1.0 usb
+    PATHS
+      /usr/lib
+      /usr/local/lib
+      /opt/local/lib
+      /sw/lib
+  )
+
+  set(LIBUSB_1_INCLUDE_DIRS
+    ${LIBUSB_1_INCLUDE_DIR}
+  )
+  set(LIBUSB_1_LIBRARIES
+    ${LIBUSB_1_LIBRARY}
+)
+
+  if (LIBUSB_1_INCLUDE_DIRS AND LIBUSB_1_LIBRARIES)
+     set(LIBUSB_1_FOUND TRUE)
+  endif (LIBUSB_1_INCLUDE_DIRS AND LIBUSB_1_LIBRARIES)
+
+  if (LIBUSB_1_FOUND)
+    if (NOT libusb_1_FIND_QUIETLY)
+      message(STATUS "Found libusb-1.0:")
+message(STATUS " - Includes: ${LIBUSB_1_INCLUDE_DIRS}")
+message(STATUS " - Libraries: ${LIBUSB_1_LIBRARIES}")
+    endif (NOT libusb_1_FIND_QUIETLY)
+  else (LIBUSB_1_FOUND)
+    if (libusb_1_FIND_REQUIRED)
+      message(FATAL_ERROR "Could not find libusb")
+    endif (libusb_1_FIND_REQUIRED)
+  endif (LIBUSB_1_FOUND)
+
+  # show the LIBUSB_1_INCLUDE_DIRS and LIBUSB_1_LIBRARIES variables only in the advanced view
+  mark_as_advanced(LIBUSB_1_INCLUDE_DIRS LIBUSB_1_LIBRARIES)
+
+endif (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)