summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2014-12-11 20:01:43 +0100
committerMartin Braun <martin.braun@ettus.com>2015-01-08 11:32:53 +0100
commitfde62f32c05ce24320fed50e5a1cca1efef16003 (patch)
treecbfa42b20891f49c749e8e815e2b055b9748ab95
parent00e5ec6e9a0d2a02a75e482543b98e17ca2dd54b (diff)
cmake: Less warnings, more info
-rw-r--r--cmake/Modules/FindUHD.cmake6
-rw-r--r--gr-uhd/CMakeLists.txt1
2 files changed, 4 insertions, 3 deletions
diff --git a/cmake/Modules/FindUHD.cmake b/cmake/Modules/FindUHD.cmake
index 21cb0942c3..cf4efe909c 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 d306dc6952..43ac4ab8a9 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