diff options
Diffstat (limited to 'gr-fcd/lib')
| -rw-r--r-- | gr-fcd/lib/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | gr-fcd/lib/fcd_source_c_impl.cc | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/gr-fcd/lib/CMakeLists.txt b/gr-fcd/lib/CMakeLists.txt index 12d14b4f71..151bb401a8 100644 --- a/gr-fcd/lib/CMakeLists.txt +++ b/gr-fcd/lib/CMakeLists.txt @@ -29,8 +29,7 @@ include_directories( ${GR_FCD_INCLUDE_DIRS} ${GR_AUDIO_INCLUDE_DIRS} ${GR_BLOCKS_INCLUDE_DIRS} - ${GNURADIO_CORE_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} + ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${LIBUSB_INCLUDE_DIR} ) @@ -45,8 +44,8 @@ if(ENABLE_GR_CTRLPORT) include_directories(${ICE_INCLUDE_DIR}) endif(ENABLE_GR_CTRLPORT) -include_directories(${LOG4CXX_INCLUDE_DIRS}) -link_directories(${LOG4CXX_LIBRARY_DIRS}) +include_directories(${LOG4CPP_INCLUDE_DIRS}) +link_directories(${LOG4CPP_LIBRARY_DIRS}) ######################################################################## # Setup library @@ -56,7 +55,7 @@ list(APPEND gr_fcd_sources ) list(APPEND fcd_libs - gnuradio-core + gnuradio-runtime gnuradio-blocks gnuradio-audio ${Boost_LIBRARIES} @@ -92,7 +91,7 @@ add_library(gnuradio-fcd SHARED ${gr_fcd_sources}) if (LINUX) list(APPEND fcd_libs rt) endif() -target_link_libraries(gnuradio-fcd ${fcd_libs} ${LOG4CXX_LIBRARIES}) +target_link_libraries(gnuradio-fcd ${fcd_libs} ${LOG4CPP_LIBRARIES}) GR_LIBRARY_FOO(gnuradio-fcd RUNTIME_COMPONENT "fcd_runtime" DEVEL_COMPONENT "fcd_devel") diff --git a/gr-fcd/lib/fcd_source_c_impl.cc b/gr-fcd/lib/fcd_source_c_impl.cc index 350ba9e544..eb61183115 100644 --- a/gr-fcd/lib/fcd_source_c_impl.cc +++ b/gr-fcd/lib/fcd_source_c_impl.cc @@ -27,7 +27,7 @@ #include <fcdhidcmd.h> // needed for extended API #include <gr_io_signature.h> #include <blocks/float_to_complex.h> -#include <gruel/attributes.h> +#include <attributes.h> //#include <iostream> //using namespace std; |