[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/cmake/modules
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2006-11-30 19:52:53
Message-ID: 1164916373.716094.19518.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 609436 by neundorf:

-proper indenting
-fix typo: USB_FIND_QUIETLY
-remove now-unnecessary standard unix search paths

Alex



 M  +13 -19    FindUSB.cmake  


--- trunk/KDE/kdelibs/cmake/modules/FindUSB.cmake #609435:609436
@@ -17,24 +17,18 @@
   set(LIBUSB_FOUND TRUE)
 
 else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
-IF (NOT WIN32)
-  # use pkg-config to get the directories and then use these values
-  # in the FIND_PATH() and FIND_LIBRARY() calls
-  INCLUDE(UsePkgConfig)
+  IF (NOT WIN32)
+    # use pkg-config to get the directories and then use these values
+    # in the FIND_PATH() and FIND_LIBRARY() calls
+    INCLUDE(UsePkgConfig)
 
-  PKGCONFIG(libUSB _libUSBIncDir _libUSBLinkDir _libUSBLinkFlags _libUSBCflags)
-ENDIF(NOT WIN32)
-  FIND_PATH(LIBUSB_INCLUDE_DIR usb.h
-    /usr/include
-    /usr/local/include
-  )
+    PKGCONFIG(libUSB _libUSBIncDir _libUSBLinkDir _libUSBLinkFlags _libUSBCflags)
+  ENDIF(NOT WIN32)
 
+  FIND_PATH(LIBUSB_INCLUDE_DIR usb.h )
+
   FIND_LIBRARY(LIBUSB_LIBRARY NAMES usb 
-    PATHS
-    ${_libUSBLinkDir}
-    /usr/lib
-    /usr/local/lib
-  )
+    PATHS ${_libUSBLinkDir} )
 
   set( LIBUSB_LIBRARIES ${LIBUSB_LIBRARY} CACHE INTERNAL "The libraries for libusb" )
 
@@ -43,13 +37,13 @@
   endif (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
 
   if (LIBUSB_FOUND)
-    if (NOT libUSB_FIND_QUIETLY)
+    if (NOT USB_FIND_QUIETLY)
       message(STATUS "Found LIBUSB: ${LIBUSB_LIBRARIES}")
-    endif (NOT libUSB_FIND_QUIETLY)
+    endif (NOT USB_FIND_QUIETLY)
   else (LIBUSB_FOUND)
-    if (libUSB_FIND_REQUIRED)
+    if (USB_FIND_REQUIRED)
       message(FATAL_ERROR "Could NOT find LIBUSB")
-    endif (libUSB_FIND_REQUIRED)
+    endif (USB_FIND_REQUIRED)
   endif (LIBUSB_FOUND)
 
   MARK_AS_ADVANCED(
[prev in list] [next in list] [prev in thread] [next in thread]