diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-03 17:39:55 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-03 17:39:55 -0500 |
| commit | dea9e149718cf900f509f79abbb4ace2c40d6ce5 (patch) | |
| tree | fab791d34bfe3117d1109a8e1dacf9b624f36c85 /gr-noaa | |
| parent | 47e6a7a0cdd65136735b2ae89fe86990431d230f (diff) | |
| parent | 5fe234f18360b4680a7b9fef1eb710cb7fe37a07 (diff) | |
Merge branch 'master' into next
Conflicts:
gnuradio-core/CMakeLists.txt
gnuradio-core/gnuradio-core.conf
gnuradio-core/src/lib/filter/gr_fir_sysconfig_x86.cc
gnuradio-core/src/lib/runtime/runtime.i
gr-atsc/src/lib/CMakeLists.txt
gr-audio/lib/CMakeLists.txt
gr-comedi/src/CMakeLists.txt
gr-digital/lib/CMakeLists.txt
gr-howto-write-a-block/CMakeLists.txt
gr-howto-write-a-block/lib/CMakeLists.txt
gr-noaa/lib/CMakeLists.txt
gr-qtgui/lib/CMakeLists.txt
gr-trellis/src/lib/CMakeLists.txt
gr-uhd/lib/CMakeLists.txt
gr-video-sdl/src/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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gr-noaa/lib/CMakeLists.txt b/gr-noaa/lib/CMakeLists.txt index 5993cf78de..feaab5ed91 100644 --- a/gr-noaa/lib/CMakeLists.txt +++ b/gr-noaa/lib/CMakeLists.txt @@ -24,10 +24,12 @@ include_directories( ${GR_NOAA_INCLUDE_DIRS} ${GNURADIO_CORE_INCLUDE_DIRS} ${GRUEL_INCLUDE_DIRS} + ${LOG4CXX_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) link_directories(${Boost_LIBRARY_DIRS}) +link_directories(${LOG4CXX_LIBRARY_DIRS}) if(ENABLE_GR_CTRLPORT) ADD_DEFINITIONS(-DGR_CTRLPORT) @@ -46,6 +48,7 @@ list(APPEND noaa_sources list(APPEND noaa_libs gnuradio-core ${Boost_LIBRARIES} + ${LOG4CXX_LIBRARIES} ) add_library(gnuradio-noaa SHARED ${noaa_sources}) |