diff options
| -rw-r--r-- | docs/doxygen/other/extra_pages.dox | 2 | ||||
| -rw-r--r-- | gnuradio-core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-digital/lib/CMakeLists.txt | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/docs/doxygen/other/extra_pages.dox b/docs/doxygen/other/extra_pages.dox index d40c692e03..44cdf9d483 100644 --- a/docs/doxygen/other/extra_pages.dox +++ b/docs/doxygen/other/extra_pages.dox @@ -79,6 +79,8 @@ audio-osx and audio-windows to be either satisfied or built. \subsection dep_gr_comedi gr-comedi: Comedi hardware interface \li comedilib (>= 0.8) http://www.comedi.org/ +\subsection dep_gr_log gr-log: Logging Tools (Optional) +\li log4cxx (>= 0.10.0) http://logging.apache.org/log4cxx \section build_gr_cmake Building GNU Radio diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt index aed16c563d..7a35551525 100644 --- a/gnuradio-core/CMakeLists.txt +++ b/gnuradio-core/CMakeLists.txt @@ -115,7 +115,7 @@ configure_file( @ONLY) install( - FILES gnuradio-core.conf + FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-core.conf DESTINATION ${GR_PREFSDIR} COMPONENT "core_runtime" ) diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt index 6c2aba941d..7bb5b9bc88 100644 --- a/gr-digital/lib/CMakeLists.txt +++ b/gr-digital/lib/CMakeLists.txt @@ -87,7 +87,6 @@ endmacro(expand_cc) # Invoke macro to generate various sources ######################################################################## expand_cc(digital_chunks_to_symbols_XX bf bc sf sc if ic) ->>>>>>> master ######################################################################## # Setup library |