diff options
| author | Martin Braun <martin.braun@ettus.com> | 2020-06-16 12:13:16 +0200 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2020-06-17 09:36:49 -0500 |
| commit | 675bec3e3837c09bd10cdf309a1a3b556d94bd0d (patch) | |
| tree | 4cfa9b0c121c1bc08dc5a6cf9aa32c9591158b28 | |
| parent | 366cab1fef44f1132a2acf8046ecaeac80793ccc (diff) | |
| download | uhd-675bec3e3837c09bd10cdf309a1a3b556d94bd0d.tar.gz uhd-675bec3e3837c09bd10cdf309a1a3b556d94bd0d.tar.bz2 uhd-675bec3e3837c09bd10cdf309a1a3b556d94bd0d.zip | |
cmake: Fix warning finding libusb
UHD has a custom file to find libusb. This fixes a warning coming from
that file caused by the fact that we're looking for a package called
LIBUSB, but the file was called FindUSB1 (i.e., we're expecting
a package name of USB1).
Common CMake calls were also moved to lowercase for CMake coding
guidelines consistency.
| -rw-r--r-- | host/cmake/Modules/FindLIBUSB.cmake (renamed from host/cmake/Modules/FindUSB1.cmake) | 4 | ||||
| -rw-r--r-- | host/lib/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/host/cmake/Modules/FindUSB1.cmake b/host/cmake/Modules/FindLIBUSB.cmake index 3763d715b..1ee364d73 100644 --- a/host/cmake/Modules/FindUSB1.cmake +++ b/host/cmake/Modules/FindLIBUSB.cmake @@ -4,7 +4,7 @@ #override LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIRS to manually set include(FindPkgConfig) -PKG_CHECK_MODULES(PC_LIBUSB QUIET libusb-1.0) +pkg_check_modules(PC_LIBUSB QUIET libusb-1.0) find_path(LIBUSB_INCLUDE_DIRS NAMES libusb.h @@ -58,5 +58,5 @@ if(HAVE_LIBUSB_STRERROR) endif(HAVE_LIBUSB_STRERROR) include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBUSB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIRS) +find_package_handle_standard_args(LIBUSB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIRS) mark_as_advanced(LIBUSB_INCLUDE_DIRS LIBUSB_LIBRARIES) diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt index 5a3377a55..c5046420a 100644 --- a/host/lib/CMakeLists.txt +++ b/host/lib/CMakeLists.txt @@ -59,7 +59,7 @@ endmacro(INCLUDE_SUBDIRECTORY) ######################################################################## message(STATUS "") # Dependencies -find_package(USB1) +find_package(LIBUSB) find_package(LIBERIO) find_package(DPDK 18.11 EXACT) LIBUHD_REGISTER_COMPONENT("LIBERIO" ENABLE_LIBERIO ON "ENABLE_LIBUHD;LIBERIO_FOUND" OFF OFF) |