From kde-commits  Mon Mar 27 17:01:53 2006
From: Hasso Tepper <hasso () kde ! org>
Date: Mon, 27 Mar 2006 17:01:53 +0000
To: kde-commits
Subject: KDE/kdebase
Message-Id: <1143478913.365505.2594.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=114347892524636

SVN commit 523225 by hasso:

Added check for libusb headers.



 M  +8 -5      cmake/modules/FindUSB.cmake  
 M  +2 -2      workspace/kcontrol/input/CMakeLists.txt  


--- trunk/KDE/kdebase/cmake/modules/FindUSB.cmake #523224:523225
@@ -5,8 +5,11 @@
 
 PKGCONFIG(libUSB _libUSBIncDir _libUSBLinkDir _libUSBLinkFlags _libUSBCflags)
 
+FIND_PATH(LIBUSB_INCLUDE_DIR usb.h
+  /usr/include
+  /usr/local/include
+)
 
-
 FIND_LIBRARY(LIBUSB_LIBRARY NAMES usb 
   PATHS
   ${_libUSBLinkDir}
@@ -16,9 +19,9 @@
 
 set( LIBUSB_LIBRARIES ${LIBUSB_LIBRARY} )
 
-if (LIBUSB_LIBRARIES)
+if (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
    set( LIBUSB_FOUND TRUE)
-endif (LIBUSB_LIBRARIES)
+endif (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
 
 
 
@@ -33,6 +36,6 @@
 endif (LIBUSB_FOUND)
 
 MARK_AS_ADVANCED(
-   LIBUSB_LIBRARIES 
-	)
+   LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES 
+)
 
--- trunk/KDE/kdebase/workspace/kcontrol/input/CMakeLists.txt #523224:523225
@@ -3,11 +3,11 @@
 add_subdirectory( pics ) 
 if(X11_Xcursor_FOUND)
 	add_subdirectory( xcursor )
-	include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/xcursor/ ${KDE4_INCLUDES} )
+	include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/xcursor/ ${KDE4_INCLUDES} ${LIBUSB_INCLUDE_DIR} )
 	set( libnoinst_SRCS ${CMAKE_SOURCE_DIR}/workspace/kcontrol/input/xcursor/themepage.cpp ${CMAKE_SOURCE_DIR}/workspace/kcontrol/input/xcursor/previewwidget.cpp )
 else(X11_Xcursor_FOUND)
 	add_subdirectory( core )
-	include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/xcursor/ ${KDE4_INCLUDES} )
+	include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/xcursor/ ${KDE4_INCLUDES} ${LIBUSB_INCLUDE_DIR} )
 	set(libnoinst_SRCS ${CMAKE_SOURCE_DIR}/workspace/kcontrol/input/core/themepage.cpp )
 endif(X11_Xcursor_FOUND)