diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-01-12 08:37:44 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-01-12 08:37:44 -0800 |
| commit | a2107f7c57059ea2dcb7037abd4f6ee6a8cf20f2 (patch) | |
| tree | ed34f90bcf3e5563d81bb6e10197b0ce8591e94c | |
| parent | 66cdb3477d425abf39570d734de8b702850ed145 (diff) | |
| parent | fde62f32c05ce24320fed50e5a1cca1efef16003 (diff) | |
Merge remote-tracking branch 'martin/cmake/fixes' into maint
| -rw-r--r-- | cmake/Modules/FindUHD.cmake | 6 | ||||
| -rw-r--r-- | 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 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 |