summaryrefslogtreecommitdiff
path: root/gr-trellis/src/lib
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2012-06-08 12:15:42 -0400
committerTom Rondeau <trondeau@vt.edu>2012-06-08 12:15:42 -0400
commitd71d02d7eb01b56b842d6a71a2b7d087c5513e7b (patch)
tree27dd93e12a85fac6dc7bd2bfb3d22b94d073918c /gr-trellis/src/lib
parenta14010ec147e3c86f93245d34be58548493aaed1 (diff)
Fixing up the gr-log capabilities.
Better handling of enable/disable function, easier integration with all components if log4cxx is or is not there. All components have been updated to be able to use logging. Docs update, too.
Diffstat (limited to 'gr-trellis/src/lib')
-rw-r--r--gr-trellis/src/lib/CMakeLists.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/gr-trellis/src/lib/CMakeLists.txt b/gr-trellis/src/lib/CMakeLists.txt
index 9080afa56e..c3f753f859 100644
--- a/gr-trellis/src/lib/CMakeLists.txt
+++ b/gr-trellis/src/lib/CMakeLists.txt
@@ -31,6 +31,9 @@ include_directories(
include_directories(${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})
+include_directories(${LOG4CXX_INCLUDE_DIRS})
+link_directories(${LOG4CXX_LIBRARY_DIRS})
+
########################################################################
# generate the python helper script which calls into the build utils
########################################################################
@@ -149,6 +152,7 @@ list(APPEND gr_trellis_sources
list(APPEND trellis_libs
gnuradio-core
${Boost_LIBRARIES}
+ ${LOG4CXX_LIBRARIES}
)
add_library(gnuradio-trellis SHARED ${gr_trellis_sources})