minor: Fix cmake modules names

This commit is contained in:
Christian W. Zuckschwerdt 2021-11-14 15:42:53 +01:00
parent 5644733c2b
commit 0097048a26
3 changed files with 52 additions and 42 deletions

View file

@ -160,16 +160,16 @@ if(ENABLE_RTLSDR) # AUTO / ON
find_package(PkgConfig) find_package(PkgConfig)
find_package(LibRTLSDR) find_package(LibRTLSDR)
find_package(LibUSB) find_package(LibUSB)
if(LIBRTLSDR_FOUND) if(LibRTLSDR_FOUND)
message(STATUS "RTL-SDR device input will be compiled. Found version ${LIBRTLSDR_VERSION}") message(STATUS "RTL-SDR device input will be compiled. Found version ${LibRTLSDR_VERSION}")
include_directories(${LIBRTLSDR_INCLUDE_DIRS}) include_directories(${LibRTLSDR_INCLUDE_DIRS})
list(APPEND SDR_LIBRARIES ${LIBRTLSDR_LIBRARIES}) list(APPEND SDR_LIBRARIES ${LibRTLSDR_LIBRARIES})
ADD_DEFINITIONS(-DRTLSDR) ADD_DEFINITIONS(-DRTLSDR)
if(LIBUSB_FOUND) if(LibUSB_FOUND)
message(STATUS "libusb-1.0 error messages are available. Found version ${LIBUSB_VERSION}") message(STATUS "libusb-1.0 error messages are available. Found version ${LibUSB_VERSION}")
include_directories(${LIBUSB_INCLUDE_DIRS}) include_directories(${LibUSB_INCLUDE_DIRS})
list(APPEND SDR_LIBRARIES ${LIBUSB_LIBRARIES}) list(APPEND SDR_LIBRARIES ${LibUSB_LIBRARIES})
ADD_DEFINITIONS(-DLIBUSB1) ADD_DEFINITIONS(-DLIBUSB1)
else() else()
message(STATUS "libusb-1.0 error messages are not available.") message(STATUS "libusb-1.0 error messages are not available.")

View file

@ -1,34 +1,39 @@
# - Try to find LibRTLSDR # - Try to find LibRTLSDR
# Once done this will define # Once done this will define
# LIBRTLSDR_FOUND - System has LibRTLSDR #
# LIBRTLSDR_INCLUDE_DIRS - The LibRTLSDR include directories # LibRTLSDR_FOUND - System has librtlsdr
# LIBRTLSDR_LIBRARIES - The libraries needed to use LibRTLSDR # LibRTLSDR_INCLUDE_DIRS - The librtlsdr include directories
# LIBRTLSDR_DEFINITIONS - Compiler switches required for using LibRTLSDR # LibRTLSDR_LIBRARIES - The libraries needed to use librtlsdr
# LibRTLSDR_DEFINITIONS - Compiler switches required for using librtlsdr
# LibRTLSDR_VERSION - The librtlsdr version
#
find_package(PkgConfig) find_package(PkgConfig)
pkg_check_modules(LIBRTLSDR_PKG QUIET librtlsdr) pkg_check_modules(PC_LibRTLSDR QUIET librtlsdr)
set(LIBRTLSDR_DEFINITIONS ${LIBRTLSDR_PKG_CFLAGS_OTHER}) set(LibRTLSDR_DEFINITIONS ${PC_LibRTLSDR_CFLAGS_OTHER})
find_path(LIBRTLSDR_INCLUDE_DIR NAMES rtl-sdr.h find_path(LibRTLSDR_INCLUDE_DIR NAMES rtl-sdr.h
HINTS ${LIBRTLSDR_PKG_INCLUDE_DIRS} HINTS ${PC_LibRTLSDR_INCLUDE_DIRS}
PATHS PATHS
/usr/include /usr/include
/usr/local/include ) /usr/local/include )
find_library(LIBRTLSDR_LIBRARY NAMES rtlsdr find_library(LibRTLSDR_LIBRARY NAMES rtlsdr
HINTS ${LIBRTLSDR_PKG_LIBRARY_DIRS} HINTS ${PC_LibRTLSDR_LIBRARY_DIRS}
PATHS PATHS
/usr/lib /usr/lib
/usr/local/lib ) /usr/local/lib )
set(LibRTLSDR_VERSION ${PC_LibRTLSDR_VERSION})
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set LIBRTLSDR_FOUND to TRUE # handle the QUIETLY and REQUIRED arguments and set LibRTLSDR_FOUND to TRUE
# if all listed variables are TRUE # if all listed variables are TRUE
find_package_handle_standard_args(LibRTLSDR DEFAULT_MSG find_package_handle_standard_args(LibRTLSDR
LIBRTLSDR_LIBRARY LIBRTLSDR_INCLUDE_DIR) REQUIRED_VARS LibRTLSDR_LIBRARY LibRTLSDR_INCLUDE_DIR
VERSION_VAR LibRTLSDR_VERSION)
mark_as_advanced(LIBRTLSDR_LIBRARY LIBRTLSDR_INCLUDE_DIR LIBRTLSDR_VERSION) mark_as_advanced(LibRTLSDR_LIBRARY LibRTLSDR_INCLUDE_DIR LibRTLSDR_VERSION)
set(LIBRTLSDR_LIBRARIES ${LIBRTLSDR_LIBRARY} ) set(LibRTLSDR_LIBRARIES ${LibRTLSDR_LIBRARY} )
set(LIBRTLSDR_INCLUDE_DIRS ${LIBRTLSDR_INCLUDE_DIR} ) set(LibRTLSDR_INCLUDE_DIRS ${LibRTLSDR_INCLUDE_DIR} )
set(LIBRTLSDR_VERSION ${LIBRTLSDR_PKG_VERSION} )

View file

@ -1,16 +1,19 @@
# - Try to find LibUSB-1.0 # - Try to find LibUSB-1.0
# Once done this will define # Once done this will define
# LIBUSB_FOUND - System has LibUSB #
# LIBUSB_INCLUDE_DIRS - The LibUSB include directories # LibUSB_FOUND - System has libusb
# LIBUSB_LIBRARIES - The libraries needed to use LibUSB # LibUSB_INCLUDE_DIRS - The libusb include directories
# LIBUSB_DEFINITIONS - Compiler switches required for using LibUSB # LibUSB_LIBRARIES - The libraries needed to use libusb
# LibUSB_DEFINITIONS - Compiler switches required for using libusb
# LibUSB_VERSION - the libusb version
#
find_package(PkgConfig) find_package(PkgConfig)
pkg_check_modules(LIBUSB_PKG QUIET libusb-1.0) pkg_check_modules(PC_LibUSB QUIET libusb-1.0)
set(LIBUSB_DEFINITIONS ${LIBUSB_PKG_CFLAGS_OTHER}) set(LibUSB_DEFINITIONS ${PC_LibUSB_CFLAGS_OTHER})
find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h find_path(LibUSB_INCLUDE_DIR NAMES libusb.h
HINTS ${LIBUSB_PKG_INCLUDE_DIRS} HINTS ${PC_LibUSB_INCLUDE_DIRS}
PATH_SUFFIXES libusb-1.0 PATH_SUFFIXES libusb-1.0
PATHS PATHS
/usr/include /usr/include
@ -29,21 +32,23 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
list(APPEND libusb1_library_names libusb-1.0) list(APPEND libusb1_library_names libusb-1.0)
endif() endif()
find_library(LIBUSB_LIBRARY find_library(LibUSB_LIBRARY
NAMES ${libusb1_library_names} NAMES ${libusb1_library_names}
HINTS ${LIBUSB_PKG_LIBRARY_DIRS} HINTS ${PC_LibUSB_LIBRARY_DIRS}
PATHS PATHS
/usr/lib /usr/lib
/usr/local/lib ) /usr/local/lib )
set(LibUSB_VERSION ${PC_LibUSB_VERSION})
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set LIBUSB_FOUND to TRUE # handle the QUIETLY and REQUIRED arguments and set LibUSB_FOUND to TRUE
# if all listed variables are TRUE # if all listed variables are TRUE
find_package_handle_standard_args(LibUSB DEFAULT_MSG find_package_handle_standard_args(LibUSB
LIBUSB_LIBRARY LIBUSB_INCLUDE_DIR) REQUIRED_VARS LibUSB_LIBRARY LibUSB_INCLUDE_DIR
VERSION_VAR LibUSB_VERSION)
mark_as_advanced(LIBUSB_LIBRARY LIBUSB_INCLUDE_DIR LIBUSB_VERSION) mark_as_advanced(LibUSB_LIBRARY LibUSB_INCLUDE_DIR LibUSB_VERSION)
set(LIBUSB_LIBRARIES ${LIBUSB_LIBRARY} ) set(LibUSB_LIBRARIES ${LibUSB_LIBRARY} )
set(LIBUSB_INCLUDE_DIRS ${LIBUSB_INCLUDE_DIR} ) set(LibUSB_INCLUDE_DIRS ${LibUSB_INCLUDE_DIR} )
set(LIBUSB_VERSION ${LIBUSB_PKG_VERSION} )