From c1c05e94b61eb4e6935bfb14ddc338afae9d96d1 Mon Sep 17 00:00:00 2001 From: Michael Dickens Date: Wed, 12 May 2021 12:51:48 -0400 Subject: cmake: fix finding PkgConfig to work robustly (without CMake warnings) --- host/cmake/Modules/FindLIBUSB.cmake | 2 +- host/cmake/Modules/UHDConfig.cmake.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'host/cmake/Modules') diff --git a/host/cmake/Modules/FindLIBUSB.cmake b/host/cmake/Modules/FindLIBUSB.cmake index 1ee364d73..9c404f68e 100644 --- a/host/cmake/Modules/FindLIBUSB.cmake +++ b/host/cmake/Modules/FindLIBUSB.cmake @@ -3,7 +3,7 @@ #sets LIBUSB_FOUND, LIBUSB_LIBRARIES, LIBUSB_INCLUDE_DIRS #override LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIRS to manually set -include(FindPkgConfig) +find_package(PkgConfig QUIET) pkg_check_modules(PC_LIBUSB QUIET libusb-1.0) find_path(LIBUSB_INCLUDE_DIRS diff --git a/host/cmake/Modules/UHDConfig.cmake.in b/host/cmake/Modules/UHDConfig.cmake.in index 299a8ef48..a45fbd3f7 100644 --- a/host/cmake/Modules/UHDConfig.cmake.in +++ b/host/cmake/Modules/UHDConfig.cmake.in @@ -39,7 +39,7 @@ if(UHD_DIR) list(APPEND UHD_LIBDIR_HINTS ${UHD_DIR}/lib) endif() -include(FindPkgConfig) +find_package(PkgConfig QUIET) if(PKG_CONFIG_FOUND) if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.0") set(UHD_QUIET "QUIET") -- cgit v1.2.3