cmake: fix log4cpp

bastibl · Jan 2, 2017 · 16d8e8c · 16d8e8c
1 parent 8d80d0a
commit 16d8e8c
Show file tree

Hide file tree

Showing 26 changed files with 48 additions and 27 deletions.
diff --git a/gr-analog/swig/CMakeLists.txt b/gr-analog/swig/CMakeLists.txt
@@ -29,6 +29,7 @@ set(GR_SWIG_INCLUDE_DIRS
     ${GR_FILTER_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${VOLK_INCLUDE_DIRS}
+    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 

diff --git a/gr-audio/examples/c++/CMakeLists.txt b/gr-audio/examples/c++/CMakeLists.txt
@@ -21,6 +21,7 @@ include_directories(
 	${GR_AUDIO_INCLUDE_DIRS}
 	${GR_ANALOG_INCLUDE_DIRS}
 	${GNURADIO_RUNTIME_INCLUDE_DIRS}
+        ${LOG4CPP_INCLUDE_DIRS}
         ${Boost_INCLUDE_DIRS}
 )
 

diff --git a/gr-audio/swig/CMakeLists.txt b/gr-audio/swig/CMakeLists.txt
@@ -26,6 +26,7 @@ include(GrSwig)
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_AUDIO_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
+    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 

diff --git a/gr-blocks/swig/CMakeLists.txt b/gr-blocks/swig/CMakeLists.txt
@@ -27,6 +27,7 @@ set(GR_SWIG_INCLUDE_DIRS
     ${GR_BLOCKS_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
+    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 

diff --git a/gr-channels/lib/CMakeLists.txt b/gr-channels/lib/CMakeLists.txt
@@ -28,6 +28,7 @@ include_directories(
     ${GR_FILTER_INCLUDE_DIRS}
     ${GR_ANALOG_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
+    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 

diff --git a/gr-channels/swig/CMakeLists.txt b/gr-channels/swig/CMakeLists.txt
@@ -27,6 +27,7 @@ set(GR_SWIG_INCLUDE_DIRS
     ${GR_CHANNELS_INCLUDE_DIRS}
     ${GR_FILTER_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
+    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 

diff --git a/gr-comedi/lib/CMakeLists.txt b/gr-comedi/lib/CMakeLists.txt
@@ -23,13 +23,13 @@
 include_directories(
     ${GR_COMEDI_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${LOG4CXX_INCLUDE_DIRS}
+    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${COMEDI_INCLUDE_DIRS}
 )
 
 link_directories(
-  ${LOG4CXX_LIBRARY_DIRS}
+    ${LOG4CPP_LIBRARY_DIRS}
     ${Boost_LIBRARY_DIRS}
     ${COMEDI_LIBRARY_DIRS}
 )

diff --git a/gr-comedi/swig/CMakeLists.txt b/gr-comedi/swig/CMakeLists.txt
@@ -26,6 +26,7 @@ include(GrSwig)
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_COMEDI_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
+    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 

diff --git a/gr-digital/swig/CMakeLists.txt b/gr-digital/swig/CMakeLists.txt
@@ -31,6 +31,7 @@ set(GR_SWIG_INCLUDE_DIRS
   ${GR_FILTER_INCLUDE_DIRS}
   ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
   ${VOLK_INCLUDE_DIRS}
+  ${LOG4CPP_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
 )
 

diff --git a/gr-dtv/lib/CMakeLists.txt b/gr-dtv/lib/CMakeLists.txt
@@ -27,11 +27,14 @@ include_directories(
     ${GR_ANALOG_INCLUDE_DIRS}
     ${GR_FEC_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
+    ${LOG4CPP_INCLUDE_DIRS}
     ${VOLK_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 
-link_directories(${Boost_LIBRARY_DIRS})
+link_directories(${Boost_LIBRARY_DIRS}
+    ${GSL_LIBRARY_DIRS}
+)
 
 if(ENABLE_GR_CTRLPORT)
   ADD_DEFINITIONS(-DGR_CTRLPORT)

diff --git a/gr-dtv/swig/CMakeLists.txt b/gr-dtv/swig/CMakeLists.txt
@@ -26,6 +26,7 @@ include(GrSwig)
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_DTV_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
+    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 

diff --git a/gr-fec/swig/CMakeLists.txt b/gr-fec/swig/CMakeLists.txt
@@ -27,6 +27,7 @@ set(GR_SWIG_INCLUDE_DIRS
     ${CMAKE_CURRENT_BINARY_DIR}/../include
     ${GR_FEC_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
+    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 

diff --git a/gr-qtgui/examples/c++/CMakeLists.txt b/gr-qtgui/examples/c++/CMakeLists.txt
@@ -24,6 +24,7 @@ include_directories(
   ${GR_BLOCKS_INCLUDE_DIRS}
   ${GR_FFT_INCLUDE_DIRS}
   ${GNURADIO_RUNTIME_INCLUDE_DIRS}
+  ${LOG4CPP_INCLUDE_DIRS}
   ${QT_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
 )

diff --git a/gr-qtgui/swig/CMakeLists.txt b/gr-qtgui/swig/CMakeLists.txt
@@ -33,6 +33,7 @@ set(GR_SWIG_INCLUDE_DIRS
     ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${QWT_INCLUDE_DIRS}
     ${QT_INCLUDE_DIRS}
+    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 

diff --git a/gr-trellis/lib/CMakeLists.txt b/gr-trellis/lib/CMakeLists.txt
@@ -25,12 +25,13 @@ include_directories(
     ${GR_TRELLIS_INCLUDE_DIRS}
     ${GR_DIGITAL_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_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}
+    ${Boost_LIBRARY_DIRS})
 
 if(ENABLE_GR_CTRLPORT)
   ADD_DEFINITIONS(-DGR_CTRLPORT)

diff --git a/gr-trellis/swig/CMakeLists.txt b/gr-trellis/swig/CMakeLists.txt
@@ -27,6 +27,7 @@ set(GR_SWIG_INCLUDE_DIRS
   ${GR_TRELLIS_INCLUDE_DIRS}
   ${GR_DIGITAL_INCLUDE_DIRS}
   ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
+  ${LOG4CPP_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
 )
 

diff --git a/gr-uhd/examples/c++/CMakeLists.txt b/gr-uhd/examples/c++/CMakeLists.txt
@@ -24,6 +24,7 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${GR_UHD_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
+    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${UHD_INCLUDE_DIRS}
 )

diff --git a/gr-uhd/lib/CMakeLists.txt b/gr-uhd/lib/CMakeLists.txt
@@ -25,23 +25,20 @@ include_directories(
     ${GR_UHD_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${UHD_INCLUDE_DIRS}
-    ${LOG4CXX_INCLUDE_DIRS}
+    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 
 link_directories(
-  ${UHD_LIBRARY_DIRS}
-  ${LOG4CXX_LIBRARY_DIRS}
-  ${Boost_LIBRARY_DIRS}
+    ${UHD_LIBRARY_DIRS}
+    ${LOG4CPP_LIBRARY_DIRS}
+    ${Boost_LIBRARY_DIRS}
 )
 
 if(ENABLE_GR_CTRLPORT)
   ADD_DEFINITIONS(-DGR_CTRLPORT)
 endif(ENABLE_GR_CTRLPORT)
 
-include_directories(${LOG4CPP_INCLUDE_DIRS})
-link_directories(${LOG4CPP_LIBRARY_DIRS})
-
 ########################################################################
 # Setup library
 ########################################################################

diff --git a/gr-uhd/swig/CMakeLists.txt b/gr-uhd/swig/CMakeLists.txt
@@ -29,6 +29,7 @@ set(GR_SWIG_INCLUDE_DIRS
     ${GR_UHD_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${UHD_INCLUDE_DIRS}
+    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 

diff --git a/gr-video-sdl/lib/CMakeLists.txt b/gr-video-sdl/lib/CMakeLists.txt
@@ -23,13 +23,14 @@
 include_directories(
     ${GR_VIDEO_SDL_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${LOG4CXX_INCLUDE_DIRS}
+    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${SDL_INCLUDE_DIR}
 )
 
-link_directories(${LOG4CXX_LIBRARY_DIRS})
-link_directories(${Boost_LIBRARY_DIRS})
+link_directories(
+    ${LOG4CPP_LIBRARY_DIRS}
+    ${Boost_LIBRARY_DIRS})
 
 if(ENABLE_GR_CTRLPORT)
   ADD_DEFINITIONS(-DGR_CTRLPORT)

diff --git a/gr-video-sdl/swig/CMakeLists.txt b/gr-video-sdl/swig/CMakeLists.txt
@@ -26,6 +26,7 @@ include(GrSwig)
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_VIDEO_SDL_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
+    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 

diff --git a/gr-vocoder/lib/CMakeLists.txt b/gr-vocoder/lib/CMakeLists.txt
@@ -23,19 +23,18 @@
 include_directories(
     ${GR_VOCODER_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${LOG4CXX_INCLUDE_DIRS}
+    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 
-link_directories(${LOG4CXX_LIBRARY_DIRS})
-link_directories(${Boost_LIBRARY_DIRS})
+link_directories(
+    ${LOG4CPP_LIBRARY_DIRS}
+    ${Boost_LIBRARY_DIRS})
 
 if(ENABLE_GR_CTRLPORT)
   ADD_DEFINITIONS(-DGR_CTRLPORT)
 endif(ENABLE_GR_CTRLPORT)
 
-include_directories(${LOG4CPP_INCLUDE_DIRS})
-link_directories(${LOG4CPP_LIBRARY_DIRS})
 
 ########################################################################
 # Setup library

diff --git a/gr-vocoder/swig/CMakeLists.txt b/gr-vocoder/swig/CMakeLists.txt
@@ -26,6 +26,7 @@ include(GrSwig)
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_VOCODER_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
+    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 

diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt
@@ -26,16 +26,17 @@ include_directories(
     ${GR_WAVELET_INCLUDE_DIRS}
     ${GR_BLOCKS_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${LOG4CXX_INCLUDE_DIRS}
+    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${GSL_INCLUDE_DIRS}
 )
 
-# is this correct?
-link_directories(${GR_WAVELET_LIBRARY_DIRS})
-link_directories(${LOG4CXX_LIBRARY_DIRS})
-link_directories(${Boost_LIBRARY_DIRS})
-link_directories(${GSL_LIBRARY_DIRS})
+link_directories(
+    ${GR_WAVELET_LIBRARY_DIRS}
+    ${LOG4CPP_LIBRARY_DIRS}
+    ${Boost_LIBRARY_DIRS}
+    ${GSL_LIBRARY_DIRS})
+
 add_definitions(${GSL_DEFINITIONS})
 
 if(ENABLE_GR_CTRLPORT)

diff --git a/gr-wavelet/swig/CMakeLists.txt b/gr-wavelet/swig/CMakeLists.txt
@@ -27,6 +27,7 @@ set(GR_SWIG_INCLUDE_DIRS
     ${GR_WAVELET_INCLUDE_DIRS}
     ${GR_BLOCKS_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
+    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${GSL_INCLUDE_DIRS}
 )

diff --git a/gr-zeromq/swig/CMakeLists.txt b/gr-zeromq/swig/CMakeLists.txt
@@ -27,6 +27,7 @@ set(GR_SWIG_INCLUDE_DIRS
     ${GR_ZEROMQ_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
+    ${LOG4CPP_INCLUDE_DIRS}
     ${ZEROMQ_INCLUDE_DIRS}
 )