From 8524736fe3c5812b5e8e0a85af45c4775a2d4ca2 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sat, 17 Sep 2011 09:26:19 -0400
Subject: cmake: modified find files to better follow coding guide

http://www.cmake.org/cgi-bin/viewcvs.cgi/Modules/readme.txt?root=CMake&view=markup
---
 cmake/Modules/FindUHD.cmake | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'cmake/Modules/FindUHD.cmake')

diff --git a/cmake/Modules/FindUHD.cmake b/cmake/Modules/FindUHD.cmake
index 7e9f70aa9..0f0cc601b 100644
--- a/cmake/Modules/FindUHD.cmake
+++ b/cmake/Modules/FindUHD.cmake
@@ -1,11 +1,15 @@
+########################################################################
+# Find the library for the USRP Hardware Driver
+########################################################################
+
 INCLUDE(FindPkgConfig)
-PKG_CHECK_MODULES(UHD uhd)
-IF(NOT UHD_FOUND)
+PKG_CHECK_MODULES(PC_UHD uhd QUIET)
 
 FIND_PATH(
     UHD_INCLUDE_DIRS
     NAMES uhd/config.hpp
     HINTS $ENV{UHD_DIR}/include
+        ${PC_UHD_INCLUDE_DIRS}
     PATHS /usr/local/include
           /usr/include
 )
@@ -14,11 +18,11 @@ FIND_LIBRARY(
     UHD_LIBRARIES
     NAMES uhd
     HINTS $ENV{UHD_DIR}/lib
+        ${PC_UHD_LIBRARIES}
     PATHS /usr/local/lib
           /usr/lib
 )
 
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(UHD DEFAULT_MSG UHD_LIBRARIES UHD_INCLUDE_DIRS)
-
-ENDIF(NOT UHD_FOUND)
+MARK_AS_ADVANCED(UHD_LIBRARIES UHD_INCLUDE_DIRS)
-- 
cgit