diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2014-08-29 14:46:57 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2014-08-29 14:46:57 -0700 |
| commit | 94562c936967f63f2705b063d5fe75b796df31bf (patch) | |
| tree | 209e2597b623f45efd88482adcb92dc8c158ddab | |
| parent | 01c392335044b4ed68110da797bd6571a341f301 (diff) | |
| parent | cbb0698b138423b6ed046c2dffff3400d9544cad (diff) | |
Merge branch 'maint'
| -rw-r--r-- | cmake/Modules/FindUSB.cmake | 2 | ||||
| -rw-r--r-- | gr-comedi/CMakeLists.txt | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/cmake/Modules/FindUSB.cmake b/cmake/Modules/FindUSB.cmake index 97f3db6752..b050c420e5 100644 --- 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 index 7c67bb56ac..caf46ee5e8 100644 --- 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 ) |