From 0097048a2670a469b4f6991a73c697f1e6aece74 Mon Sep 17 00:00:00 2001
From: "Christian W. Zuckschwerdt" <christian@zuckschwerdt.org>
Date: Sun, 14 Nov 2021 15:42:53 +0100
Subject: [PATCH] minor: Fix cmake modules names
---
CMakeLists.txt | 16 ++++++-------
cmake/Modules/FindLibRTLSDR.cmake | 39 +++++++++++++++++--------------
cmake/Modules/FindLibUSB.cmake | 39 +++++++++++++++++--------------
3 files changed, 52 insertions(+), 42 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6bb9d59..a3f11ac9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -160,16 +160,16 @@ if(ENABLE_RTLSDR) # AUTO / ON
find_package(PkgConfig)
find_package(LibRTLSDR)
find_package(LibUSB)
-if(LIBRTLSDR_FOUND)
- message(STATUS "RTL-SDR device input will be compiled. Found version ${LIBRTLSDR_VERSION}")
- include_directories(${LIBRTLSDR_INCLUDE_DIRS})
- list(APPEND SDR_LIBRARIES ${LIBRTLSDR_LIBRARIES})
+if(LibRTLSDR_FOUND)
+ message(STATUS "RTL-SDR device input will be compiled. Found version ${LibRTLSDR_VERSION}")
+ include_directories(${LibRTLSDR_INCLUDE_DIRS})
+ list(APPEND SDR_LIBRARIES ${LibRTLSDR_LIBRARIES})
ADD_DEFINITIONS(-DRTLSDR)
-if(LIBUSB_FOUND)
- message(STATUS "libusb-1.0 error messages are available. Found version ${LIBUSB_VERSION}")
- include_directories(${LIBUSB_INCLUDE_DIRS})
- list(APPEND SDR_LIBRARIES ${LIBUSB_LIBRARIES})
+if(LibUSB_FOUND)
+ message(STATUS "libusb-1.0 error messages are available. Found version ${LibUSB_VERSION}")
+ include_directories(${LibUSB_INCLUDE_DIRS})
+ list(APPEND SDR_LIBRARIES ${LibUSB_LIBRARIES})
ADD_DEFINITIONS(-DLIBUSB1)
else()
message(STATUS "libusb-1.0 error messages are not available.")
diff --git a/cmake/Modules/FindLibRTLSDR.cmake b/cmake/Modules/FindLibRTLSDR.cmake
index 00178a67..1a6e571f 100644
--- a/cmake/Modules/FindLibRTLSDR.cmake
+++ b/cmake/Modules/FindLibRTLSDR.cmake
@@ -1,34 +1,39 @@
# - Try to find LibRTLSDR
# Once done this will define
-# LIBRTLSDR_FOUND - System has LibRTLSDR
-# LIBRTLSDR_INCLUDE_DIRS - The LibRTLSDR include directories
-# LIBRTLSDR_LIBRARIES - The libraries needed to use LibRTLSDR
-# LIBRTLSDR_DEFINITIONS - Compiler switches required for using LibRTLSDR
+#
+# LibRTLSDR_FOUND - System has librtlsdr
+# LibRTLSDR_INCLUDE_DIRS - The librtlsdr include directories
+# LibRTLSDR_LIBRARIES - The libraries needed to use librtlsdr
+# LibRTLSDR_DEFINITIONS - Compiler switches required for using librtlsdr
+# LibRTLSDR_VERSION - The librtlsdr version
+#
find_package(PkgConfig)
-pkg_check_modules(LIBRTLSDR_PKG QUIET librtlsdr)
-set(LIBRTLSDR_DEFINITIONS ${LIBRTLSDR_PKG_CFLAGS_OTHER})
+pkg_check_modules(PC_LibRTLSDR QUIET librtlsdr)
+set(LibRTLSDR_DEFINITIONS ${PC_LibRTLSDR_CFLAGS_OTHER})
-find_path(LIBRTLSDR_INCLUDE_DIR NAMES rtl-sdr.h
- HINTS ${LIBRTLSDR_PKG_INCLUDE_DIRS}
+find_path(LibRTLSDR_INCLUDE_DIR NAMES rtl-sdr.h
+ HINTS ${PC_LibRTLSDR_INCLUDE_DIRS}
PATHS
/usr/include
/usr/local/include )
-find_library(LIBRTLSDR_LIBRARY NAMES rtlsdr
- HINTS ${LIBRTLSDR_PKG_LIBRARY_DIRS}
+find_library(LibRTLSDR_LIBRARY NAMES rtlsdr
+ HINTS ${PC_LibRTLSDR_LIBRARY_DIRS}
PATHS
/usr/lib
/usr/local/lib )
+set(LibRTLSDR_VERSION ${PC_LibRTLSDR_VERSION})
+
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
-find_package_handle_standard_args(LibRTLSDR DEFAULT_MSG
- LIBRTLSDR_LIBRARY LIBRTLSDR_INCLUDE_DIR)
+find_package_handle_standard_args(LibRTLSDR
+ 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_INCLUDE_DIRS ${LIBRTLSDR_INCLUDE_DIR} )
-set(LIBRTLSDR_VERSION ${LIBRTLSDR_PKG_VERSION} )
+set(LibRTLSDR_LIBRARIES ${LibRTLSDR_LIBRARY} )
+set(LibRTLSDR_INCLUDE_DIRS ${LibRTLSDR_INCLUDE_DIR} )
diff --git a/cmake/Modules/FindLibUSB.cmake b/cmake/Modules/FindLibUSB.cmake
index 44eee705..e423527f 100644
--- a/cmake/Modules/FindLibUSB.cmake
+++ b/cmake/Modules/FindLibUSB.cmake
@@ -1,16 +1,19 @@
# - Try to find LibUSB-1.0
# Once done this will define
-# LIBUSB_FOUND - System has LibUSB
-# LIBUSB_INCLUDE_DIRS - The LibUSB include directories
-# LIBUSB_LIBRARIES - The libraries needed to use LibUSB
-# LIBUSB_DEFINITIONS - Compiler switches required for using LibUSB
+#
+# LibUSB_FOUND - System has libusb
+# LibUSB_INCLUDE_DIRS - The libusb include directories
+# LibUSB_LIBRARIES - The libraries needed to use libusb
+# LibUSB_DEFINITIONS - Compiler switches required for using libusb
+# LibUSB_VERSION - the libusb version
+#
find_package(PkgConfig)
-pkg_check_modules(LIBUSB_PKG QUIET libusb-1.0)
-set(LIBUSB_DEFINITIONS ${LIBUSB_PKG_CFLAGS_OTHER})
+pkg_check_modules(PC_LibUSB QUIET libusb-1.0)
+set(LibUSB_DEFINITIONS ${PC_LibUSB_CFLAGS_OTHER})
-find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h
- HINTS ${LIBUSB_PKG_INCLUDE_DIRS}
+find_path(LibUSB_INCLUDE_DIR NAMES libusb.h
+ HINTS ${PC_LibUSB_INCLUDE_DIRS}
PATH_SUFFIXES libusb-1.0
PATHS
/usr/include
@@ -29,21 +32,23 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
list(APPEND libusb1_library_names libusb-1.0)
endif()
-find_library(LIBUSB_LIBRARY
+find_library(LibUSB_LIBRARY
NAMES ${libusb1_library_names}
- HINTS ${LIBUSB_PKG_LIBRARY_DIRS}
+ HINTS ${PC_LibUSB_LIBRARY_DIRS}
PATHS
/usr/lib
/usr/local/lib )
+set(LibUSB_VERSION ${PC_LibUSB_VERSION})
+
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
-find_package_handle_standard_args(LibUSB DEFAULT_MSG
- LIBUSB_LIBRARY LIBUSB_INCLUDE_DIR)
+find_package_handle_standard_args(LibUSB
+ 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_INCLUDE_DIRS ${LIBUSB_INCLUDE_DIR} )
-set(LIBUSB_VERSION ${LIBUSB_PKG_VERSION} )
+set(LibUSB_LIBRARIES ${LibUSB_LIBRARY} )
+set(LibUSB_INCLUDE_DIRS ${LibUSB_INCLUDE_DIR} )