diff options
| author |   Michael Dickens <michael.dickens@ettus.com> | 2021-05-12 12:51:48 -0400 |
|---|---|---|
| committer |   Martin Braun <martin.braun@ettus.com> | 2021-07-08 12:45:32 +0200 |
| commit | 7e1f90101fb155da450344a4816d87f8b25a6b15 (patch) | |
| tree | 3ec67093c30a3dec53517985326c27e9a91da034 | |
| parent | tests: add missing header, required by some compilers (diff) | |
| download | uhd-7e1f90101fb155da450344a4816d87f8b25a6b15.tar.xz uhd-7e1f90101fb155da450344a4816d87f8b25a6b15.zip | |
cmake: fix finding PkgConfig to work robustly (without CMake warnings)
| -rw-r--r-- | host/cmake/Modules/FindLIBUSB.cmake | 2 | ||||
| -rw-r--r-- | host/cmake/Modules/UHDConfig.cmake.in | 2 |
2 files changed, 2 insertions, 2 deletions
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") |