diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-04-02 23:04:08 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-04-02 23:04:08 -0700 |
| commit | c6dbde23b256a41b3d92cb4ad6b63287095d53c7 (patch) | |
| tree | 71db12ea2e1667770c22568dcdf5e0857d5f1e59 /gr-comedi | |
| parent | 22b70d0889ef3c51e27a31ee18d153093a55cbb8 (diff) | |
| parent | 98758cbfa9a2aff714952d19e773bc370dfa2185 (diff) | |
Merged next into uninstalled import branch.
Diffstat (limited to 'gr-comedi')
| -rw-r--r-- | gr-comedi/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-comedi/gnuradio-comedi.pc.in | 2 | ||||
| -rw-r--r-- | gr-comedi/include/comedi/api.h | 2 | ||||
| -rw-r--r-- | gr-comedi/lib/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | gr-comedi/swig/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | gr-comedi/swig/comedi_swig.i | 2 |
6 files changed, 9 insertions, 10 deletions
diff --git a/gr-comedi/CMakeLists.txt b/gr-comedi/CMakeLists.txt index d038dc4a4f..86c754cfa8 100644 --- a/gr-comedi/CMakeLists.txt +++ b/gr-comedi/CMakeLists.txt @@ -32,7 +32,7 @@ GR_REGISTER_COMPONENT("gr-comedi" ENABLE_GR_COMEDI COMEDI_FOUND LINUX #comedi uses linux specific device noces Boost_FOUND - ENABLE_GR_CORE + ENABLE_GNURADIO_RUNTIME ) GR_SET_GLOBAL(GR_COMEDI_INCLUDE_DIRS diff --git a/gr-comedi/gnuradio-comedi.pc.in b/gr-comedi/gnuradio-comedi.pc.in index 205b40e37c..0f3ac4cae4 100644 --- a/gr-comedi/gnuradio-comedi.pc.in +++ b/gr-comedi/gnuradio-comedi.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: gnuradio-comedi Description: GNU Radio blocks for the comedi library -Requires: gnuradio-core +Requires: gnuradio-runtime Version: @LIBVER@ Libs: -L${libdir} -lgnuradio-comedi Cflags: -I${includedir} diff --git a/gr-comedi/include/comedi/api.h b/gr-comedi/include/comedi/api.h index c9f9fbcae4..54aa18f317 100644 --- a/gr-comedi/include/comedi/api.h +++ b/gr-comedi/include/comedi/api.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_COMEDI_API_H #define INCLUDED_COMEDI_API_H -#include <gruel/attributes.h> +#include <attributes.h> #ifdef gnuradio_comedi_EXPORTS # define COMEDI_API __GR_ATTR_EXPORT diff --git a/gr-comedi/lib/CMakeLists.txt b/gr-comedi/lib/CMakeLists.txt index 53a0ae9ff6..57b4df11a4 100644 --- a/gr-comedi/lib/CMakeLists.txt +++ b/gr-comedi/lib/CMakeLists.txt @@ -22,8 +22,7 @@ ######################################################################## include_directories( ${GR_COMEDI_INCLUDE_DIRS} - ${GNURADIO_CORE_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} + ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${LOG4CXX_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${COMEDI_INCLUDE_DIRS} @@ -49,7 +48,7 @@ list(APPEND comedi_sources ) list(APPEND comedi_libs - gnuradio-core + gnuradio-runtime ${Boost_LIBRARIES} ${COMEDI_LIBRARIES} ) diff --git a/gr-comedi/swig/CMakeLists.txt b/gr-comedi/swig/CMakeLists.txt index 1c88a4eb94..a783fe4af8 100644 --- a/gr-comedi/swig/CMakeLists.txt +++ b/gr-comedi/swig/CMakeLists.txt @@ -25,15 +25,15 @@ include(GrSwig) set(GR_SWIG_INCLUDE_DIRS ${GR_COMEDI_INCLUDE_DIRS} - ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} + ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) # 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}/../lib) +set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/comedi) +set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) set(GR_SWIG_LIBRARIES gnuradio-comedi) diff --git a/gr-comedi/swig/comedi_swig.i b/gr-comedi/swig/comedi_swig.i index c8a1fff392..179882991a 100644 --- a/gr-comedi/swig/comedi_swig.i +++ b/gr-comedi/swig/comedi_swig.i @@ -22,7 +22,7 @@ #define COMEDI_API -%include "gnuradio.i" +%include "runtime_swig.i" //load generated python docstrings %include "comedi_swig_doc.i" |