diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-26 20:18:53 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-26 20:18:53 -0700 |
| commit | 26dceecc80390f10cedb94bd9e4fd655827d7f17 (patch) | |
| tree | f88cb2995133048b4a2191bae688fa09b33a19ae /gr-atsc | |
| parent | 9bbbda510c265b211b5b571db79ba259c67ee049 (diff) | |
runtime: migrate remaining gnuradio-core contents into gnuradio-runtime
Diffstat (limited to 'gr-atsc')
| -rw-r--r-- | gr-atsc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-atsc/lib/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | gr-atsc/swig/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-atsc/swig/atsc_swig.i | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/gr-atsc/CMakeLists.txt b/gr-atsc/CMakeLists.txt index d46f109be7..a281cc8401 100644 --- a/gr-atsc/CMakeLists.txt +++ b/gr-atsc/CMakeLists.txt @@ -28,7 +28,7 @@ include(GrBoost) include(GrComponent) GR_REGISTER_COMPONENT("gr-atsc" ENABLE_GR_ATSC Boost_FOUND - ENABLE_GR_CORE + ENABLE_GNURADIO_RUNTIME ENABLE_GR_FFT ENABLE_GR_BLOCKS ENABLE_GR_FEC diff --git a/gr-atsc/lib/CMakeLists.txt b/gr-atsc/lib/CMakeLists.txt index df9cc7c396..b3aa626cb5 100644 --- a/gr-atsc/lib/CMakeLists.txt +++ b/gr-atsc/lib/CMakeLists.txt @@ -27,7 +27,7 @@ include_directories( ${GR_FILTER_INCLUDE_DIRS} ${GR_ANALOG_INCLUDE_DIRS} ${GR_FEC_INCLUDE_DIRS} - ${GNURADIO_CORE_INCLUDE_DIRS} + ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${GRUEL_INCLUDE_DIRS} ${LOG4CPP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} @@ -118,7 +118,7 @@ ENDIF(MSVC) list(APPEND atsc_libs gnuradio-filter gnuradio-analog - gnuradio-core + gnuradio-runtime gnuradio-fec ${Boost_LIBRARIES} ${LOG4CPP_LIBRARIES} @@ -156,7 +156,7 @@ list(APPEND test_atsci_sources include(GrTest) list(APPEND GR_TEST_TARGET_DEPS gnuradio-atsc gnuradio-fec gnuradio-filter gnuradio-analog gnuradio-fft) add_executable(test_atsci ${test_atsci_sources} test_atsci.cc) -target_link_libraries(test_atsci gnuradio-atsc gnuradio-core ${CPPUNIT_LIBRARIES}) +target_link_libraries(test_atsci gnuradio-atsc gnuradio-runtime ${CPPUNIT_LIBRARIES}) GR_ADD_TEST(atsci-test test_atsci) endif(ENABLE_TESTING) diff --git a/gr-atsc/swig/CMakeLists.txt b/gr-atsc/swig/CMakeLists.txt index 71039f80aa..37da95dce1 100644 --- a/gr-atsc/swig/CMakeLists.txt +++ b/gr-atsc/swig/CMakeLists.txt @@ -28,7 +28,7 @@ set(GR_SWIG_INCLUDE_DIRS ${GR_FILTER_INCLUDE_DIRS} ${GR_BLOCKS_INCLUDE_DIRS} ${GR_ANALOG_INCLUDE_DIRS} - ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} + ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS} ${GRUEL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${FFTW3F_INCLUDE_DIRS} diff --git a/gr-atsc/swig/atsc_swig.i b/gr-atsc/swig/atsc_swig.i index 4711d497eb..6ca65a6c69 100644 --- a/gr-atsc/swig/atsc_swig.i +++ b/gr-atsc/swig/atsc_swig.i @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -%include "gnuradio.i" // the common stuff +%include "runtime_swig.i" // the common stuff //load generated python docstrings %include "atsc_swig_doc.i" |