[Commit-gnuradio] [gnuradio] 02/03: cmake: Less warnings, more info

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit fde62f32c05ce24320fed50e5a1cca1efef16003
Author: Martin Braun <address@hidden>
Date:   Thu Dec 11 20:01:43 2014 +0100

    cmake: Less warnings, more info
---
 cmake/Modules/FindUHD.cmake | 6 +++---
 gr-uhd/CMakeLists.txt       | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cmake/Modules/FindUHD.cmake b/cmake/Modules/FindUHD.cmake
index 21cb094..cf4efe9 100644
--- a/cmake/Modules/FindUHD.cmake
+++ b/cmake/Modules/FindUHD.cmake
@@ -1,4 +1,4 @@
-########################################################################
+#######################################################################
 # Find the library for the USRP Hardware Driver
 ########################################################################
 
@@ -49,7 +49,7 @@ find_package(
 set(CMAKE_MODULE_PATH ${SAVED_CMAKE_MODULE_PATH})
 
 # check if UHDConfig was used above
-if(NOT $ENV{UHD_CONFIG_VERSION_USED})
+if(NOT "$ENV{UHD_CONFIG_VERSION_USED}" STREQUAL "TRUE")
 
   # Not used; try the "old" method (not as robust)
 
@@ -73,7 +73,7 @@ if(NOT $ENV{UHD_CONFIG_VERSION_USED})
     PATHS /usr/local/lib
           /usr/lib
   )
-endif(NOT $ENV{UHD_CONFIG_VERSION_USED})
+endif(NOT "$ENV{UHD_CONFIG_VERSION_USED}" STREQUAL "TRUE")
 
 if(UHD_LIBRARIES AND UHD_INCLUDE_DIRS)
 
diff --git a/gr-uhd/CMakeLists.txt b/gr-uhd/CMakeLists.txt
index d306dc6..43ac4ab 100644
--- a/gr-uhd/CMakeLists.txt
+++ b/gr-uhd/CMakeLists.txt
@@ -36,6 +36,7 @@ GR_REGISTER_COMPONENT("gr-uhd" ENABLE_GR_UHD
     ENABLE_GR_BLOCKS
     ENABLE_GR_ANALOG
 )
+message(STATUS "  UHD Version: ${UHD_VERSION}")
 
 GR_SET_GLOBAL(GR_UHD_INCLUDE_DIRS
     ${CMAKE_CURRENT_SOURCE_DIR}/include