diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2013-04-30 10:41:37 -0700 |
|---|---|---|
| committer | Nicholas Corgan <nick.corgan@ettus.com> | 2013-04-30 10:41:37 -0700 |
| commit | 086241535896c60cb918a4f24df89e9cb25804a8 (patch) | |
| tree | 1505365b375641e567def0f01fdb1b4a0899f007 | |
| parent | 638a41bb0243356b8d34bedec46b6022efb24817 (diff) | |
| parent | b8bdbc51312b1a1cf80dbc251a8ebb537ac9d5a9 (diff) | |
| download | uhd-086241535896c60cb918a4f24df89e9cb25804a8.tar.gz uhd-086241535896c60cb918a4f24df89e9cb25804a8.tar.bz2 uhd-086241535896c60cb918a4f24df89e9cb25804a8.zip | |
Merge branch 'maint'
| -rw-r--r-- | host/cmake/Modules/FindUSB1.cmake | 2 | ||||
| -rw-r--r-- | host/cmake/debian/watch | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/host/cmake/Modules/FindUSB1.cmake b/host/cmake/Modules/FindUSB1.cmake index 626d06cc1..a1ab4ca90 100644 --- a/host/cmake/Modules/FindUSB1.cmake +++ b/host/cmake/Modules/FindUSB1.cmake @@ -22,7 +22,7 @@ FIND_PATH(LIBUSB_INCLUDE_DIRS set(libusb1_library_names usb-1.0) #libusb-1.0 compatible library on freebsd -if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") +if((CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") OR (CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD")) list(APPEND libusb1_library_names usb) endif() diff --git a/host/cmake/debian/watch b/host/cmake/debian/watch new file mode 100644 index 000000000..9e79c82aa --- /dev/null +++ b/host/cmake/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=uversionmangle=s/([^0-9]|)0*(\d)/$1$2/g;s/_/./g \ +https://github.com/EttusResearch/uhd/tags .*/release_([\d_]+)\.tar\..* |