From c895363e3b41deb45fc3534c1a004b1adf48f28f Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Fri, 2 Oct 2020 23:22:03 +0100 Subject: [PATCH] Update FindUHD rules --- cmake/Modules/FindUHD.cmake | 58 ++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/cmake/Modules/FindUHD.cmake b/cmake/Modules/FindUHD.cmake index fdb116ff2..76d62b21b 100644 --- a/cmake/Modules/FindUHD.cmake +++ b/cmake/Modules/FindUHD.cmake @@ -1,29 +1,29 @@ -IF(NOT UHD_FOUND) - INCLUDE(FindPkgConfig) - PKG_CHECK_MODULES(PC_UHD uhd) - - FIND_PATH( - UHD_INCLUDE_DIRS - NAMES uhd.h - HINTS $ENV{UHD_DIR}/include - PATHS /usr/local/include - /usr/include - ) - - FIND_LIBRARY( - UHD_LIBRARIES - NAMES uhd - HINTS $ENV{UHD_DIR}/lib - PATHS /usr/local/lib - /usr/lib - /usr/lib64 - ) - - message(STATUS "UHD LIBRARIES " ${UHD_LIBRARIES}) - message(STATUS "UHD INCLUDE DIRS " ${UHD_INCLUDE_DIRS}) - - INCLUDE(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(UHD DEFAULT_MSG UHD_LIBRARIES UHD_INCLUDE_DIRS) - MARK_AS_ADVANCED(UHD_LIBRARIES UHD_INCLUDE_DIRS) - -ENDIF(NOT UHD_FOUND) +IF(NOT UHD_FOUND) + INCLUDE(FindPkgConfig) + PKG_CHECK_MODULES(PC_UHD uhd) + + FIND_PATH( + UHD_INCLUDE_DIR + NAMES uhd.h + HINTS ${UHD_DIR}/include + PATHS /usr/local/include + /usr/include + ) + + FIND_LIBRARY( + UHD_LIBRARIES + NAMES uhd + HINTS ${UHD_DIR}/lib + PATHS /usr/local/lib + /usr/lib + /usr/lib64 + ) + + message(STATUS "UHD LIBRARIES " ${UHD_LIBRARIES}) + message(STATUS "UHD INCLUDE DIRS " ${UHD_INCLUDE_DIR}) + + INCLUDE(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(UHD DEFAULT_MSG UHD_LIBRARIES UHD_INCLUDE_DIR) + MARK_AS_ADVANCED(UHD_LIBRARIES UHD_INCLUDE_DIR) + +ENDIF(NOT UHD_FOUND)