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-wavelet/lib/CMakeLists.txt | |
| parent | 22b70d0889ef3c51e27a31ee18d153093a55cbb8 (diff) | |
| parent | 98758cbfa9a2aff714952d19e773bc370dfa2185 (diff) | |
Merged next into uninstalled import branch.
Diffstat (limited to 'gr-wavelet/lib/CMakeLists.txt')
| -rw-r--r-- | gr-wavelet/lib/CMakeLists.txt | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt index 090392f584..eb01d7d1cb 100644 --- a/gr-wavelet/lib/CMakeLists.txt +++ b/gr-wavelet/lib/CMakeLists.txt @@ -25,8 +25,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${GR_WAVELET_INCLUDE_DIRS} ${GR_BLOCKS_INCLUDE_DIRS} - ${GNURADIO_CORE_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} + ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${LOG4CXX_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${GSL_INCLUDE_DIRS} @@ -44,6 +43,10 @@ if(ENABLE_GR_CTRLPORT) include_directories(${ICE_INCLUDE_DIR}) endif(ENABLE_GR_CTRLPORT) +include_directories(${LOG4CPP_INCLUDE_DIRS}) +link_directories(${LOG4CPP_LIBRARY_DIRS}) + + ######################################################################## # Setup library ######################################################################## @@ -68,12 +71,12 @@ if(MSVC) endif(MSVC) list(APPEND wavelet_libs - gnuradio-core + gnuradio-runtime gnuradio-blocks ${Boost_LIBRARIES} ${WAVELET_LIBRARIES} ${GSL_LIBRARIES} - ${LOG4CXX_LIBRARIES} + ${LOG4CPP_LIBRARIES} ) add_library(gnuradio-wavelet SHARED ${gr_wavelet_sources}) @@ -81,4 +84,4 @@ target_link_libraries(gnuradio-wavelet ${wavelet_libs}) GR_LIBRARY_FOO(gnuradio-wavelet RUNTIME_COMPONENT "wavelet_runtime" DEVEL_COMPONENT "wavelet_devel") add_dependencies(gnuradio-wavelet wavelet_generated_includes wavelet_generated_swigs - gnuradio-core) + gnuradio-runtime) |