aboutsummaryrefslogtreecommitdiffstats
path: root/host
diff options
context:
space:
mode:
Diffstat (limited to 'host')
-rw-r--r--host/cmake/Modules/FindUSB1.cmake2
-rw-r--r--host/include/uhd/property_tree.hpp2
-rw-r--r--host/lib/convert/CMakeLists.txt7
3 files changed, 2 insertions, 9 deletions
diff --git a/host/cmake/Modules/FindUSB1.cmake b/host/cmake/Modules/FindUSB1.cmake
index b2e4d118c..96e2a5aae 100644
--- a/host/cmake/Modules/FindUSB1.cmake
+++ b/host/cmake/Modules/FindUSB1.cmake
@@ -20,7 +20,7 @@ FIND_PATH(LIBUSB_INCLUDE_DIRS
)
#standard library name for libusb-1.0
-set(libusb1_library_names usb-1.0)
+set(libusb1_library_names usb-1.0 libusb-1.0)
#libusb-1.0 compatible library on freebsd
if((CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") OR (CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD"))
diff --git a/host/include/uhd/property_tree.hpp b/host/include/uhd/property_tree.hpp
index 47b2c5736..f889ba235 100644
--- a/host/include/uhd/property_tree.hpp
+++ b/host/include/uhd/property_tree.hpp
@@ -38,7 +38,7 @@ public:
/*!
* Register a coercer into the property.
- * A coercer is a special subscribes that coerces the value.
+ * A coercer is a special subscriber that coerces the value.
* Only one coercer may be registered per property.
* Registering a coercer replaces the previous coercer.
* \param coercer the coercer callback function
diff --git a/host/lib/convert/CMakeLists.txt b/host/lib/convert/CMakeLists.txt
index 00e129b78..473b7f59f 100644
--- a/host/lib/convert/CMakeLists.txt
+++ b/host/lib/convert/CMakeLists.txt
@@ -90,17 +90,10 @@ ENDIF(HAVE_EMMINTRIN_H)
# Check for NEON SIMD headers
########################################################################
IF(CMAKE_COMPILER_IS_GNUCXX)
- SET(NEON_FLAGS "-mfloat-abi=softfp -mfpu=neon")
- SET(CMAKE_REQUIRED_FLAGS ${NEON_FLAGS})
CHECK_INCLUDE_FILE_CXX(arm_neon.h HAVE_ARM_NEON_H)
- UNSET(CMAKE_REQUIRED_FLAGS)
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
IF(HAVE_ARM_NEON_H)
- SET_SOURCE_FILES_PROPERTIES(
- ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp
- PROPERTIES COMPILE_FLAGS "${NEON_FLAGS}"
- )
LIBUHD_APPEND_SOURCES(
${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp
)