Merge branch 'maint'

jmcorgan · jmcorgan · commit 94562c936967 · 2014-08-29T14:46:57.000-07:00
diff --git a/cmake/Modules/FindUSB.cmake b/cmake/Modules/FindUSB.cmake
@@ -8,7 +8,7 @@ if(NOT LIBUSB_FOUND)
     /usr/local/include
   )
 
-  find_library(LIBUSB_LIBRARIES NAMES usb-1.0
+  find_library(LIBUSB_LIBRARIES NAMES usb-1.0 usb
     PATHS
     ${LIBUSB_PKG_LIBRARY_DIRS}
     /usr/lib
diff --git a/gr-comedi/CMakeLists.txt b/gr-comedi/CMakeLists.txt
@@ -30,7 +30,6 @@ PKG_CHECK_MODULES(COMEDI comedilib)
 include(GrComponent)
 GR_REGISTER_COMPONENT("gr-comedi" ENABLE_GR_COMEDI
     COMEDI_FOUND
-    LINUX #comedi uses linux specific device noces
     Boost_FOUND
     ENABLE_GNURADIO_RUNTIME
 )

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ if(NOT LIBUSB_FOUND)`
`8`	`8`	`/usr/local/include`
`9`	`9`	`)`
`10`	`10`
`11`		`- find_library(LIBUSB_LIBRARIES NAMES usb-1.0`
	`11`	`+ find_library(LIBUSB_LIBRARIES NAMES usb-1.0 usb`
`12`	`12`	`PATHS`
`13`	`13`	`${LIBUSB_PKG_LIBRARY_DIRS}`
`14`	`14`	`/usr/lib`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ PKG_CHECK_MODULES(COMEDI comedilib)`
`30`	`30`	`include(GrComponent)`
`31`	`31`	`GR_REGISTER_COMPONENT("gr-comedi" ENABLE_GR_COMEDI`
`32`	`32`	`COMEDI_FOUND`
`33`		`- LINUX #comedi uses linux specific device noces`
`34`	`33`	`Boost_FOUND`
`35`	`34`	`ENABLE_GNURADIO_RUNTIME`
`36`	`35`	`)`