diff options
| author | Marcus Müller <marcus@hostalia.de> | 2018-08-31 23:02:22 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2018-08-31 23:02:22 +0200 |
| commit | 254fe5e89403d4de1fa6663d09efdf946996aff3 (patch) | |
| tree | 62877d7ac7fdedf6c397c51e22ac6f97eba97ddf /gr-comedi | |
| parent | 896d1c9da31963ecf5b0d90942c2af51ca998a69 (diff) | |
| parent | 5ad935c3a3dd46ce2860b13e2b774e4841784616 (diff) | |
Merge remote-tracking branch 'origin/next' into merge_next
Diffstat (limited to 'gr-comedi')
| -rw-r--r-- | gr-comedi/CMakeLists.txt | 35 | ||||
| -rw-r--r-- | gr-comedi/include/gnuradio/comedi/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-comedi/lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-comedi/python/comedi/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gr-comedi/python/comedi/__init__.py | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | gr-comedi/python/comedi/qa_comedi.py | 1 | ||||
| -rw-r--r-- | gr-comedi/swig/CMakeLists.txt | 3 |
7 files changed, 7 insertions, 45 deletions
diff --git a/gr-comedi/CMakeLists.txt b/gr-comedi/CMakeLists.txt index 07da808f4e..ca12f73b77 100644 --- a/gr-comedi/CMakeLists.txt +++ b/gr-comedi/CMakeLists.txt @@ -52,40 +52,6 @@ SET(GR_PKG_COMEDI_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/comedi) if(ENABLE_GR_COMEDI) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_COMEDI_DESCRIPTION "GNU Radio Comedi Blocks") - -CPACK_COMPONENT("comedi_runtime" - GROUP "Comedi" - DISPLAY_NAME "Runtime" - DESCRIPTION "Dynamic link libraries" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("comedi_devel" - GROUP "Comedi" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("comedi_python" - GROUP "Comedi" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime" - DEPENDS "runtime_python;comedi_runtime" -) - -CPACK_COMPONENT("comedi_swig" - GROUP "Comedi" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;comedi_python;comedi_devel" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(include/gnuradio/comedi) @@ -106,7 +72,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-comedi.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "comedi_devel" ) endif(ENABLE_GR_COMEDI) diff --git a/gr-comedi/include/gnuradio/comedi/CMakeLists.txt b/gr-comedi/include/gnuradio/comedi/CMakeLists.txt index 51a609e421..601c1fb91d 100644 --- a/gr-comedi/include/gnuradio/comedi/CMakeLists.txt +++ b/gr-comedi/include/gnuradio/comedi/CMakeLists.txt @@ -25,6 +25,5 @@ install(FILES sink_s.h source_s.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/comedi - COMPONENT "comedi_devel" ) diff --git a/gr-comedi/lib/CMakeLists.txt b/gr-comedi/lib/CMakeLists.txt index 105ba0a875..aca63b7680 100644 --- a/gr-comedi/lib/CMakeLists.txt +++ b/gr-comedi/lib/CMakeLists.txt @@ -52,7 +52,7 @@ list(APPEND comedi_libs add_library(gnuradio-comedi SHARED ${comedi_sources}) target_link_libraries(gnuradio-comedi ${comedi_libs}) -GR_LIBRARY_FOO(gnuradio-comedi RUNTIME_COMPONENT "comedi_runtime" DEVEL_COMPONENT "comedi_devel") +GR_LIBRARY_FOO(gnuradio-comedi) if(ENABLE_STATIC_LIBS) if(ENABLE_GR_CTRLPORT) @@ -74,6 +74,6 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-comedi_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "comedi_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-comedi/python/comedi/CMakeLists.txt b/gr-comedi/python/comedi/CMakeLists.txt index 9febc08250..01a917807d 100644 --- a/gr-comedi/python/comedi/CMakeLists.txt +++ b/gr-comedi/python/comedi/CMakeLists.txt @@ -26,7 +26,6 @@ GR_PYTHON_INSTALL( FILES __init__.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/comedi - COMPONENT "comedi_python" ) ######################################################################## @@ -45,6 +44,6 @@ if(ENABLE_TESTING) file(GLOB py_qa_test_files "qa_*.py") foreach(py_qa_test_file ${py_qa_test_files}) get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE) - GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file}) + GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) diff --git a/gr-comedi/python/comedi/__init__.py b/gr-comedi/python/comedi/__init__.py index 701b82af70..f9f1124e5a 100644 --- a/gr-comedi/python/comedi/__init__.py +++ b/gr-comedi/python/comedi/__init__.py @@ -21,13 +21,14 @@ ''' Blocks and utilities for COMEDI devices ''' +from __future__ import unicode_literals # The presence of this file turns this directory into a Python package import os try: - from comedi_swig import * + from .comedi_swig import * except ImportError: dirname, filename = os.path.split(os.path.abspath(__file__)) __path__.append(os.path.join(dirname, "..", "..", "swig")) - from comedi_swig import * + from .comedi_swig import * diff --git a/gr-comedi/python/comedi/qa_comedi.py b/gr-comedi/python/comedi/qa_comedi.py index 08ec92dd13..f4dc7b7778 100755..100644 --- a/gr-comedi/python/comedi/qa_comedi.py +++ b/gr-comedi/python/comedi/qa_comedi.py @@ -20,6 +20,7 @@ # Boston, MA 02110-1301, USA. # + from gnuradio import gr, gr_unittest, comedi class test_comedi(gr_unittest.TestCase): diff --git a/gr-comedi/swig/CMakeLists.txt b/gr-comedi/swig/CMakeLists.txt index b31e4e87eb..bc9a99bd4a 100644 --- a/gr-comedi/swig/CMakeLists.txt +++ b/gr-comedi/swig/CMakeLists.txt @@ -34,7 +34,6 @@ if(ENABLE_GR_CTRLPORT) endif(ENABLE_GR_CTRLPORT) # Setup swig docs to depend on includes and pull in from build directory -set(GR_SWIG_TARGET_DEPS comedi_generated_includes) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/comedi_swig_doc.i) set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/comedi) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) @@ -46,7 +45,6 @@ GR_SWIG_MAKE(comedi_swig comedi_swig.i) GR_SWIG_INSTALL( TARGETS comedi_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/comedi - COMPONENT "comedi_python" ) install( @@ -54,5 +52,4 @@ install( comedi_swig.i ${CMAKE_CURRENT_BINARY_DIR}/comedi_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "comedi_swig" ) |