From 675bec3e3837c09bd10cdf309a1a3b556d94bd0d Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Tue, 16 Jun 2020 12:13:16 +0200 Subject: 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. --- host/cmake/Modules/FindLIBUSB.cmake | 62 +++++++++++++++++++++++++++++++++++++ host/cmake/Modules/FindUSB1.cmake | 62 ------------------------------------- host/lib/CMakeLists.txt | 2 +- 3 files changed, 63 insertions(+), 63 deletions(-) create mode 100644 host/cmake/Modules/FindLIBUSB.cmake delete mode 100644 host/cmake/Modules/FindUSB1.cmake diff --git a/host/cmake/Modules/FindLIBUSB.cmake b/host/cmake/Modules/FindLIBUSB.cmake new file mode 100644 index 000000000..1ee364d73 --- /dev/null +++ b/host/cmake/Modules/FindLIBUSB.cmake @@ -0,0 +1,62 @@ + +#find libusb 1.0 on various systems +#sets LIBUSB_FOUND, LIBUSB_LIBRARIES, LIBUSB_INCLUDE_DIRS +#override LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIRS to manually set + +include(FindPkgConfig) +pkg_check_modules(PC_LIBUSB QUIET libusb-1.0) + +find_path(LIBUSB_INCLUDE_DIRS + NAMES libusb.h + HINTS $ENV{LIBUSB_DIR}/include $ENV{LIBUSB_DIR}/include/libusb-1.0 + ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDEDIR}/libusb-1.0 + PATHS /usr/local/include/libusb-1.0 /usr/local/include + /usr/include/libusb-1.0 /usr/include + /opt/local/include/libusb-1.0 + + #non-conforming naming convention, + #backwards compatible with old script + ${LIBUSB_INCLUDE_DIR} +) + +#standard library name for libusb-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") + list(APPEND libusb1_library_names usb) +endif() + +find_library(LIBUSB_LIBRARIES + NAMES ${libusb1_library_names} + HINTS $ENV{LIBUSB_DIR}/lib ${PC_LIBUSB_LIBDIR} + PATHS /usr/local/lib /usr/lib /opt/local/lib +) + +enable_language(C) #needs C support for check below +include(CheckFunctionExists) +if(LIBUSB_INCLUDE_DIRS) + set(CMAKE_REQUIRED_INCLUDES ${LIBUSB_INCLUDE_DIRS}) +endif() +if(LIBUSB_LIBRARIES) + set(CMAKE_REQUIRED_LIBRARIES ${LIBUSB_LIBRARIES}) +endif() + +CHECK_FUNCTION_EXISTS("libusb_handle_events_timeout_completed" HAVE_LIBUSB_HANDLE_EVENTS_TIMEOUT_COMPLETED) +if(HAVE_LIBUSB_HANDLE_EVENTS_TIMEOUT_COMPLETED) + list(APPEND LIBUSB_DEFINITIONS "HAVE_LIBUSB_HANDLE_EVENTS_TIMEOUT_COMPLETED=1") +endif(HAVE_LIBUSB_HANDLE_EVENTS_TIMEOUT_COMPLETED) + +CHECK_FUNCTION_EXISTS("libusb_error_name" HAVE_LIBUSB_ERROR_NAME) +if(HAVE_LIBUSB_ERROR_NAME) + list(APPEND LIBUSB_DEFINITIONS "HAVE_LIBUSB_ERROR_NAME=1") +endif(HAVE_LIBUSB_ERROR_NAME) + +CHECK_FUNCTION_EXISTS("libusb_strerror" HAVE_LIBUSB_STRERROR) +if(HAVE_LIBUSB_STRERROR) + list(APPEND LIBUSB_DEFINITIONS "HAVE_LIBUSB_STRERROR=1") +endif(HAVE_LIBUSB_STRERROR) + +include(FindPackageHandleStandardArgs) +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/cmake/Modules/FindUSB1.cmake b/host/cmake/Modules/FindUSB1.cmake deleted file mode 100644 index 3763d715b..000000000 --- a/host/cmake/Modules/FindUSB1.cmake +++ /dev/null @@ -1,62 +0,0 @@ - -#find libusb 1.0 on various systems -#sets LIBUSB_FOUND, LIBUSB_LIBRARIES, LIBUSB_INCLUDE_DIRS -#override LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIRS to manually set - -include(FindPkgConfig) -PKG_CHECK_MODULES(PC_LIBUSB QUIET libusb-1.0) - -find_path(LIBUSB_INCLUDE_DIRS - NAMES libusb.h - HINTS $ENV{LIBUSB_DIR}/include $ENV{LIBUSB_DIR}/include/libusb-1.0 - ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDEDIR}/libusb-1.0 - PATHS /usr/local/include/libusb-1.0 /usr/local/include - /usr/include/libusb-1.0 /usr/include - /opt/local/include/libusb-1.0 - - #non-conforming naming convention, - #backwards compatible with old script - ${LIBUSB_INCLUDE_DIR} -) - -#standard library name for libusb-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") - list(APPEND libusb1_library_names usb) -endif() - -find_library(LIBUSB_LIBRARIES - NAMES ${libusb1_library_names} - HINTS $ENV{LIBUSB_DIR}/lib ${PC_LIBUSB_LIBDIR} - PATHS /usr/local/lib /usr/lib /opt/local/lib -) - -enable_language(C) #needs C support for check below -include(CheckFunctionExists) -if(LIBUSB_INCLUDE_DIRS) - set(CMAKE_REQUIRED_INCLUDES ${LIBUSB_INCLUDE_DIRS}) -endif() -if(LIBUSB_LIBRARIES) - set(CMAKE_REQUIRED_LIBRARIES ${LIBUSB_LIBRARIES}) -endif() - -CHECK_FUNCTION_EXISTS("libusb_handle_events_timeout_completed" HAVE_LIBUSB_HANDLE_EVENTS_TIMEOUT_COMPLETED) -if(HAVE_LIBUSB_HANDLE_EVENTS_TIMEOUT_COMPLETED) - list(APPEND LIBUSB_DEFINITIONS "HAVE_LIBUSB_HANDLE_EVENTS_TIMEOUT_COMPLETED=1") -endif(HAVE_LIBUSB_HANDLE_EVENTS_TIMEOUT_COMPLETED) - -CHECK_FUNCTION_EXISTS("libusb_error_name" HAVE_LIBUSB_ERROR_NAME) -if(HAVE_LIBUSB_ERROR_NAME) - list(APPEND LIBUSB_DEFINITIONS "HAVE_LIBUSB_ERROR_NAME=1") -endif(HAVE_LIBUSB_ERROR_NAME) - -CHECK_FUNCTION_EXISTS("libusb_strerror" HAVE_LIBUSB_STRERROR) -if(HAVE_LIBUSB_STRERROR) - list(APPEND LIBUSB_DEFINITIONS "HAVE_LIBUSB_STRERROR=1") -endif(HAVE_LIBUSB_STRERROR) - -include(FindPackageHandleStandardArgs) -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) -- cgit v1.2.3