diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-01-12 08:53:16 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-01-12 08:53:16 -0800 |
| commit | 5cb307e6f347cf2cb15990848040f7c743c271e5 (patch) | |
| tree | cd92e0fba0ded7e4b65885b3b90f704372afecf4 | |
| parent | f0cd50417cdbdf376ff9a2ebe011cd908cc861fd (diff) | |
| parent | a2107f7c57059ea2dcb7037abd4f6ee6a8cf20f2 (diff) | |
Merge branch 'maint'
| -rw-r--r-- | cmake/Modules/FindUHD.cmake | 6 | ||||
| -rw-r--r-- | gr-qtgui/grc/qtgui_entry.xml | 2 | ||||
| -rw-r--r-- | gr-uhd/CMakeLists.txt | 1 |
3 files changed, 5 insertions, 4 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-qtgui/grc/qtgui_entry.xml b/gr-qtgui/grc/qtgui_entry.xml index 6de6330984..cce2edb4b2 100644 --- a/gr-qtgui/grc/qtgui_entry.xml +++ b/gr-qtgui/grc/qtgui_entry.xml @@ -20,7 +20,7 @@ $(win).addWidget(Qt.QLabel($label+": ")) self._$(id)_line_edit = Qt.QLineEdit(str(self.$id)) self._$(id)_tool_bar.addWidget(self._$(id)_line_edit) self._$(id)_line_edit.returnPressed.connect( - lambda: self.set_$(id)($(type.conv)(self._$(id)_line_edit.text().toAscii()))) + lambda: self.set_$(id)($(type.conv)(str(self._$(id)_line_edit.text().toAscii())))) $(gui_hint()($win))</make> <callback>self.set_$(id)($value)</callback> <callback>Qt.QMetaObject.invokeMethod(self._$(id)_line_edit, "setText", Qt.Q_ARG("QString", $(type.str)($id)))</callback> 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 |