[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 03/03: Merge branch 'next' into next-qt5
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 03/03: Merge branch 'next' into next-qt5 |
|
Date: |
Wed, 3 Aug 2016 23:35:14 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next-qt5
in repository gnuradio.
commit e09246a4a2514ba0974a3960be86fc50c72e3ee9
Merge: 826b794 675afc0
Author: Johnathan Corgan <address@hidden>
Date: Wed Aug 3 16:11:32 2016 -0700
Merge branch 'next' into next-qt5
Conflicts:
gr-qtgui/grc/CMakeLists.txt
CMakeLists.txt | 46 -
cmake/Modules/GrMiscUtils.cmake | 13 +-
cmake/Modules/GrPackage.cmake | 182 ----
cmake/Modules/GrPython.cmake | 4 +-
cmake/Modules/GrSwig.cmake | 5 +-
cmake/Modules/NSIS.InstallOptions.ini.in | 37 -
cmake/Modules/NSIS.template.in | 951 ---------------------
cmake/Packaging/Fedora-15.cmake | 11 -
cmake/Packaging/Fedora-16.cmake | 11 -
cmake/Packaging/Fedora-17.cmake | 11 -
cmake/Packaging/Fedora-18.cmake | 11 -
cmake/Packaging/Ubuntu-10.04.cmake | 11 -
cmake/Packaging/Ubuntu-10.10.cmake | 11 -
cmake/Packaging/Ubuntu-11.04.cmake | 12 -
cmake/Packaging/Ubuntu-11.10.cmake | 11 -
cmake/Packaging/Ubuntu-12.04.cmake | 11 -
cmake/Packaging/Ubuntu-12.10.cmake | 11 -
cmake/Packaging/Ubuntu-13.04.cmake | 13 -
cmake/Packaging/Ubuntu-15.10.cmake | 13 -
cmake/Packaging/post_install.in | 4 -
cmake/Packaging/post_uninstall.in | 3 -
cmake/Packaging/postinst.in | 6 -
cmake/Packaging/postrm.in | 5 -
cmake/Packaging/pre_install.in | 1 -
cmake/Packaging/pre_uninstall.in | 3 -
cmake/Packaging/preinst.in | 5 -
cmake/Packaging/prerm.in | 5 -
docs/CMakeLists.txt | 17 -
docs/doxygen/CMakeLists.txt | 2 +-
docs/exploring-gnuradio/CMakeLists.txt | 1 -
gnuradio-runtime/CMakeLists.txt | 36 -
gnuradio-runtime/apps/CMakeLists.txt | 1 -
gnuradio-runtime/examples/mp-sched/CMakeLists.txt | 2 -
gnuradio-runtime/examples/network/CMakeLists.txt | 2 -
.../examples/volk_benchmark/CMakeLists.txt | 2 -
gnuradio-runtime/include/gnuradio/CMakeLists.txt | 2 -
.../include/gnuradio/messages/CMakeLists.txt | 1 -
.../include/gnuradio/thread/CMakeLists.txt | 1 -
gnuradio-runtime/include/pmt/CMakeLists.txt | 2 +-
gnuradio-runtime/lib/CMakeLists.txt | 4 +-
gnuradio-runtime/lib/controlport/CMakeLists.txt | 1 -
gnuradio-runtime/lib/pmt/CMakeLists.txt | 5 +-
gnuradio-runtime/python/gnuradio/CMakeLists.txt | 1 -
.../python/gnuradio/ctrlport/CMakeLists.txt | 5 -
gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt | 1 -
.../python/gnuradio/gru/CMakeLists.txt | 1 -
gnuradio-runtime/python/pmt/CMakeLists.txt | 1 -
gnuradio-runtime/swig/CMakeLists.txt | 3 -
gr-analog/CMakeLists.txt | 35 -
gr-analog/examples/CMakeLists.txt | 2 -
gr-analog/examples/tags/CMakeLists.txt | 1 -
gr-analog/grc/CMakeLists.txt | 3 +-
gr-analog/include/gnuradio/analog/CMakeLists.txt | 1 -
gr-analog/lib/CMakeLists.txt | 4 +-
gr-analog/python/analog/CMakeLists.txt | 1 -
gr-analog/swig/CMakeLists.txt | 2 -
gr-audio/CMakeLists.txt | 42 -
gr-audio/examples/c++/CMakeLists.txt | 1 -
gr-audio/examples/grc/CMakeLists.txt | 1 -
gr-audio/examples/python/CMakeLists.txt | 1 -
gr-audio/grc/CMakeLists.txt | 2 +-
gr-audio/include/gnuradio/audio/CMakeLists.txt | 1 -
gr-audio/lib/CMakeLists.txt | 6 +-
gr-audio/python/audio/CMakeLists.txt | 1 -
gr-audio/swig/CMakeLists.txt | 2 -
gr-blocks/CMakeLists.txt | 35 -
gr-blocks/examples/CMakeLists.txt | 3 +-
gr-blocks/examples/ctrlport/CMakeLists.txt | 2 -
gr-blocks/examples/metadata/CMakeLists.txt | 1 -
gr-blocks/examples/msg_passing/CMakeLists.txt | 1 -
gr-blocks/examples/tags/CMakeLists.txt | 2 -
gr-blocks/grc/CMakeLists.txt | 2 +-
gr-blocks/include/gnuradio/blocks/CMakeLists.txt | 2 -
gr-blocks/lib/CMakeLists.txt | 4 +-
gr-blocks/python/blocks/CMakeLists.txt | 1 -
gr-blocks/python/grc_gnuradio/CMakeLists.txt | 2 -
gr-blocks/swig/CMakeLists.txt | 5 +-
gr-channels/CMakeLists.txt | 35 -
gr-channels/examples/CMakeLists.txt | 1 -
gr-channels/grc/CMakeLists.txt | 2 +-
.../include/gnuradio/channels/CMakeLists.txt | 1 -
gr-channels/lib/CMakeLists.txt | 4 +-
gr-channels/python/channels/CMakeLists.txt | 1 -
gr-channels/swig/CMakeLists.txt | 2 -
gr-comedi/CMakeLists.txt | 35 -
gr-comedi/include/gnuradio/comedi/CMakeLists.txt | 1 -
gr-comedi/lib/CMakeLists.txt | 4 +-
gr-comedi/python/comedi/CMakeLists.txt | 1 -
gr-comedi/swig/CMakeLists.txt | 2 -
gr-digital/CMakeLists.txt | 35 -
gr-digital/examples/CMakeLists.txt | 7 -
gr-digital/grc/CMakeLists.txt | 2 +-
gr-digital/include/gnuradio/digital/CMakeLists.txt | 1 -
gr-digital/lib/CMakeLists.txt | 4 +-
gr-digital/python/digital/CMakeLists.txt | 2 -
gr-digital/python/grc_gnuradio/CMakeLists.txt | 1 -
gr-digital/swig/CMakeLists.txt | 2 -
gr-dtv/CMakeLists.txt | 35 -
gr-dtv/apps/CMakeLists.txt | 1 -
gr-dtv/examples/CMakeLists.txt | 2 -
gr-dtv/grc/CMakeLists.txt | 1 -
gr-dtv/include/gnuradio/dtv/CMakeLists.txt | 1 -
gr-dtv/lib/CMakeLists.txt | 4 +-
gr-dtv/python/dtv/CMakeLists.txt | 1 -
gr-dtv/swig/CMakeLists.txt | 2 -
gr-fec/CMakeLists.txt | 35 -
gr-fec/apps/CMakeLists.txt | 2 -
gr-fec/examples/CMakeLists.txt | 1 -
gr-fec/grc/CMakeLists.txt | 6 +-
gr-fec/include/gnuradio/fec/CMakeLists.txt | 5 +-
gr-fec/lib/CMakeLists.txt | 4 +-
gr-fec/lib/reed-solomon/CMakeLists.txt | 1 -
gr-fec/lib/viterbi/CMakeLists.txt | 1 -
gr-fec/python/fec/CMakeLists.txt | 1 -
gr-fec/python/fec/LDPC/CMakeLists.txt | 3 +-
gr-fec/python/fec/polar/CMakeLists.txt | 4 -
gr-fec/swig/CMakeLists.txt | 2 -
gr-fft/CMakeLists.txt | 35 -
gr-fft/grc/CMakeLists.txt | 1 -
gr-fft/include/gnuradio/fft/CMakeLists.txt | 3 -
gr-fft/lib/CMakeLists.txt | 4 +-
gr-fft/python/fft/CMakeLists.txt | 1 -
gr-fft/swig/CMakeLists.txt | 2 -
gr-filter/CMakeLists.txt | 35 -
gr-filter/apps/CMakeLists.txt | 1 -
gr-filter/examples/CMakeLists.txt | 2 -
gr-filter/grc/CMakeLists.txt | 1 -
gr-filter/include/gnuradio/filter/CMakeLists.txt | 1 -
gr-filter/lib/CMakeLists.txt | 4 +-
gr-filter/python/filter/CMakeLists.txt | 1 -
gr-filter/python/filter/design/CMakeLists.txt | 1 -
gr-filter/python/filter/gui/CMakeLists.txt | 1 -
gr-filter/swig/CMakeLists.txt | 2 -
gr-qtgui/CMakeLists.txt | 37 -
gr-qtgui/apps/CMakeLists.txt | 2 -
gr-qtgui/examples/CMakeLists.txt | 2 -
gr-qtgui/examples/c++/CMakeLists.txt | 1 -
gr-qtgui/grc/CMakeLists.txt | 2 +-
gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt | 1 -
gr-qtgui/lib/CMakeLists.txt | 4 +-
gr-qtgui/python/qtgui/CMakeLists.txt | 1 -
gr-qtgui/swig/CMakeLists.txt | 2 -
gr-trellis/CMakeLists.txt | 48 --
gr-trellis/doc/CMakeLists.txt | 2 -
gr-trellis/examples/grc/CMakeLists.txt | 1 -
gr-trellis/examples/python/CMakeLists.txt | 3 -
gr-trellis/grc/CMakeLists.txt | 1 -
gr-trellis/include/gnuradio/trellis/CMakeLists.txt | 1 -
gr-trellis/lib/CMakeLists.txt | 4 +-
gr-trellis/python/trellis/CMakeLists.txt | 1 -
gr-trellis/swig/CMakeLists.txt | 2 -
gr-uhd/CMakeLists.txt | 42 -
gr-uhd/apps/CMakeLists.txt | 7 -
gr-uhd/examples/c++/CMakeLists.txt | 1 -
gr-uhd/examples/grc/CMakeLists.txt | 1 -
gr-uhd/examples/python/CMakeLists.txt | 1 -
gr-uhd/grc/CMakeLists.txt | 1 -
gr-uhd/include/gnuradio/uhd/CMakeLists.txt | 1 -
gr-uhd/lib/CMakeLists.txt | 4 +-
gr-uhd/python/uhd/CMakeLists.txt | 1 -
gr-uhd/swig/CMakeLists.txt | 2 -
gr-utils/CMakeLists.txt | 10 -
gr-utils/python/modtool/CMakeLists.txt | 3 -
.../gr-newmod/cmake/Modules/GrMiscUtils.cmake | 12 +-
.../modtool/gr-newmod/cmake/Modules/GrPython.cmake | 4 +-
.../modtool/gr-newmod/cmake/Modules/GrSwig.cmake | 5 +-
.../python/modtool/gr-newmod/lib/CMakeLists.txt | 3 +-
gr-utils/python/utils/CMakeLists.txt | 2 -
gr-video-sdl/CMakeLists.txt | 35 -
gr-video-sdl/grc/CMakeLists.txt | 2 -
.../include/gnuradio/video_sdl/CMakeLists.txt | 1 -
gr-video-sdl/lib/CMakeLists.txt | 4 +-
gr-video-sdl/python/video_sdl/CMakeLists.txt | 1 -
gr-video-sdl/swig/CMakeLists.txt | 2 -
gr-vocoder/CMakeLists.txt | 42 -
gr-vocoder/examples/CMakeLists.txt | 3 -
gr-vocoder/grc/CMakeLists.txt | 3 -
gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt | 3 -
gr-vocoder/lib/CMakeLists.txt | 4 +-
gr-vocoder/python/vocoder/CMakeLists.txt | 1 -
gr-vocoder/swig/CMakeLists.txt | 2 -
gr-wavelet/CMakeLists.txt | 35 -
gr-wavelet/include/gnuradio/wavelet/CMakeLists.txt | 1 -
gr-wavelet/lib/CMakeLists.txt | 4 +-
gr-wavelet/python/wavelet/CMakeLists.txt | 1 -
gr-wavelet/swig/CMakeLists.txt | 2 -
gr-wxgui/CMakeLists.txt | 33 -
gr-wxgui/grc/CMakeLists.txt | 3 +-
gr-wxgui/include/gnuradio/wxgui/CMakeLists.txt | 1 -
gr-wxgui/lib/CMakeLists.txt | 6 +-
gr-wxgui/python/wxgui/CMakeLists.txt | 3 -
gr-wxgui/swig/CMakeLists.txt | 2 -
gr-zeromq/CMakeLists.txt | 36 -
gr-zeromq/examples/CMakeLists.txt | 1 -
gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt | 1 -
gr-zeromq/lib/CMakeLists.txt | 4 +-
gr-zeromq/swig/CMakeLists.txt | 2 -
grc/CMakeLists.txt | 24 -
grc/blocks/CMakeLists.txt | 1 -
grc/core/CMakeLists.txt | 2 -
grc/core/generator/CMakeLists.txt | 2 -
grc/core/utils/CMakeLists.txt | 1 -
grc/gui/CMakeLists.txt | 1 -
grc/scripts/CMakeLists.txt | 1 -
grc/scripts/freedesktop/CMakeLists.txt | 3 +-
205 files changed, 74 insertions(+), 2428 deletions(-)
diff --cc gr-qtgui/CMakeLists.txt
index c06e516,80bb8b3..e467567
--- a/gr-qtgui/CMakeLists.txt
+++ b/gr-qtgui/CMakeLists.txt
@@@ -79,41 -66,10 +79,7 @@@ SET(GR_PKG_QTGUI_EXAMPLES_DIR ${GR_PKG_
########################################################################
if(ENABLE_GR_QTGUI)
-# populate the environment with QT variables
-include(GrSetupQt4)
-
########################################################################
- # Setup CPack components
- ########################################################################
- include(GrPackage)
- CPACK_SET(CPACK_COMPONENT_GROUP_QTGUI_DESCRIPTION "GNU Radio QtGUI Blocks")
-
- CPACK_COMPONENT("qtgui_runtime"
- GROUP "QtGUI"
- DISPLAY_NAME "Runtime"
- DESCRIPTION "Runtime"
- DEPENDS "runtime_runtime"
- )
-
- CPACK_COMPONENT("qtgui_devel"
- GROUP "QtGUI"
- DISPLAY_NAME "Development"
- DESCRIPTION "C++ headers, package config, import libraries"
- DEPENDS "runtime_devel"
- )
-
- CPACK_COMPONENT("qtgui_python"
- GROUP "QtGUI"
- DISPLAY_NAME "Python"
- DESCRIPTION "Python modules for runtime; GRC xml files"
- DEPENDS "runtime_python;qtgui_runtime"
- )
-
- CPACK_COMPONENT("qtgui_swig"
- GROUP "QtGUI"
- DISPLAY_NAME "SWIG"
- DESCRIPTION "SWIG development .i files"
- DEPENDS "runtime_swig;qtgui_python;qtgui_devel"
- )
-
- ########################################################################
# Add subdirectories
########################################################################
add_subdirectory(include/gnuradio/qtgui)
diff --cc gr-qtgui/grc/CMakeLists.txt
index d01bcc5,7da5fbc..5ae893c
--- a/gr-qtgui/grc/CMakeLists.txt
+++ b/gr-qtgui/grc/CMakeLists.txt
@@@ -18,12 -18,5 +18,12 @@@
# Boston, MA 02110-1301, USA.
########################################################################
-file(GLOB xml_files "*.xml")
+file(GLOB xml_cmakein_files "*.xml.cmakein")
+
+foreach(xml_cmakein_file IN ITEMS ${xml_cmakein_files})
+ get_filename_component(FILE_NAME ${xml_cmakein_file} NAME_WE)
+ configure_file(${xml_cmakein_file}
"${CMAKE_CURRENT_BINARY_DIR}/${FILE_NAME}.xml" @ONLY)
+ set(xml_files ${xml_files}
"${CMAKE_CURRENT_BINARY_DIR}/${FILE_NAME}.xml")
+endforeach(xml_cmakein_file)
+
- install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT
"qtgui_python")
+ install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR})
diff --cc gr-qtgui/python/qtgui/CMakeLists.txt
index e1a07fd,212c98e..23e75e6
--- a/gr-qtgui/python/qtgui/CMakeLists.txt
+++ b/gr-qtgui/python/qtgui/CMakeLists.txt
@@@ -20,19 -20,10 +20,18 @@@
########################################################################
include(GrPython)
+if (DESIRED_QT_VERSION MATCHES 4)
+ set(PY_QT_IMPORT "from PyQt4 import Qt, QtCore, QtGui as QtWidgets")
+else()
+ set(PY_QT_IMPORT "from PyQt5 import Qt, QtCore, QtWidgets")
+endif()
+
+configure_file(range.py.cmakein "${CMAKE_CURRENT_BINARY_DIR}/range.py" @ONLY)
+
GR_PYTHON_INSTALL(
FILES __init__.py
- range.py
+ "${CMAKE_CURRENT_BINARY_DIR}/range.py"
DESTINATION ${GR_PYTHON_DIR}/gnuradio/qtgui
- COMPONENT "qtgui_python"
)
########################################################################
diff --cc grc/blocks/CMakeLists.txt
index a2207fa,eaa5797..8d93852
--- a/grc/blocks/CMakeLists.txt
+++ b/grc/blocks/CMakeLists.txt
@@@ -39,7 -37,6 +39,6 @@@ GEN_BLOCK_XML(variable_struct.xml.p
add_custom_target(grc_generated_xml ALL DEPENDS ${generated_xml_files})
install(
- FILES ${xml_files} ${generated_xml_files}
+ FILES ${xml_files} "${CMAKE_CURRENT_BINARY_DIR}/options.xml"
${generated_xml_files}
DESTINATION ${GRC_BLOCKS_DIR}
- COMPONENT "grc"
)