diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-13 18:02:42 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-13 18:02:42 -0400 |
| commit | 1c9d67fc220737873728310bd679d9e9cfab470a (patch) | |
| tree | 5fbf8c157da3e938d9b90ebe720f3efbcef39215 /gr-noaa | |
| parent | 1d8d1f111c41862d877686a89344a4a74f146cee (diff) | |
| parent | 1bacc04f7a8f2f9c868a9934624683c7cefb2300 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-audio/lib/CMakeLists.txt
gr-blocks/include/blocks/CMakeLists.txt
gr-blocks/include/blocks/socket_pdu.h
gr-blocks/lib/CMakeLists.txt
gr-blocks/swig/blocks_swig.i
gr-comedi/src/CMakeLists.txt
gr-howto-write-a-block/lib/CMakeLists.txt
gr-noaa/lib/CMakeLists.txt
gr-qtgui/lib/CMakeLists.txt
gr-uhd/lib/CMakeLists.txt
gr-vocoder/lib/CMakeLists.txt
gr-wavelet/lib/CMakeLists.txt
Diffstat (limited to 'gr-noaa')
| -rw-r--r-- | gr-noaa/lib/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-noaa/lib/CMakeLists.txt b/gr-noaa/lib/CMakeLists.txt index baa4c732a2..df0eafb0f3 100644 --- a/gr-noaa/lib/CMakeLists.txt +++ b/gr-noaa/lib/CMakeLists.txt @@ -24,12 +24,12 @@ include_directories( ${GR_NOAA_INCLUDE_DIRS} ${GNURADIO_CORE_INCLUDE_DIRS} ${GRUEL_INCLUDE_DIRS} - ${LOG4CXX_INCLUDE_DIRS} + ${LOG4CPP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) link_directories(${Boost_LIBRARY_DIRS}) -link_directories(${LOG4CXX_LIBRARY_DIRS}) +link_directories(${LOG4CPP_LIBRARY_DIRS}) if(ENABLE_GR_CTRLPORT) ADD_DEFINITIONS(-DGR_CTRLPORT) @@ -62,7 +62,7 @@ endif(MSVC) list(APPEND noaa_libs gnuradio-core ${Boost_LIBRARIES} - ${LOG4CXX_LIBRARIES} + ${LOG4CPP_LIBRARIES} ) add_library(gnuradio-noaa SHARED ${noaa_sources}) |