commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] [gnuradio] 02/05: cmake: add log4cpp to runtime includ


From: git
Subject: [Commit-gnuradio] [gnuradio] 02/05: cmake: add log4cpp to runtime includes
Date: Wed, 22 Mar 2017 16:41:28 +0000 (UTC)

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 51e565532f1f867baacc004222971fcf3703773b
Author: Bastian Bloessl <address@hidden>
Date:   Sun Jan 29 10:17:22 2017 +0100

    cmake: add log4cpp to runtime includes
---
 gnuradio-runtime/CMakeLists.txt      | 1 +
 gnuradio-runtime/swig/CMakeLists.txt | 1 -
 gr-audio/lib/CMakeLists.txt          | 4 +---
 gr-blocks/lib/CMakeLists.txt         | 2 --
 gr-blocks/tests/CMakeLists.txt       | 6 +-----
 gr-digital/lib/CMakeLists.txt        | 4 ----
 gr-fec/lib/CMakeLists.txt            | 3 ---
 gr-filter/lib/CMakeLists.txt         | 2 --
 gr-qtgui/lib/CMakeLists.txt          | 3 ---
 gr-uhd/lib/CMakeLists.txt            | 4 ----
 gr-vocoder/lib/CMakeLists.txt        | 4 ----
 gr-wavelet/lib/CMakeLists.txt        | 4 ----
 12 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/gnuradio-runtime/CMakeLists.txt b/gnuradio-runtime/CMakeLists.txt
index 1bee143..961647f 100644
--- a/gnuradio-runtime/CMakeLists.txt
+++ b/gnuradio-runtime/CMakeLists.txt
@@ -43,6 +43,7 @@ GR_SET_GLOBAL(GNURADIO_RUNTIME_INCLUDE_DIRS
     ${CMAKE_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/gnuradio-runtime/include
     ${CMAKE_BINARY_DIR}/gnuradio-runtime/include
+    ${LOG4CPP_INCLUDE_DIRS}
 )
 
 GR_SET_GLOBAL(GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS
diff --git a/gnuradio-runtime/swig/CMakeLists.txt 
b/gnuradio-runtime/swig/CMakeLists.txt
index ca9ddd4..3236bce 100644
--- a/gnuradio-runtime/swig/CMakeLists.txt
+++ b/gnuradio-runtime/swig/CMakeLists.txt
@@ -27,7 +27,6 @@ set(GR_SWIG_INCLUDE_DIRS
     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 
diff --git a/gr-audio/lib/CMakeLists.txt b/gr-audio/lib/CMakeLists.txt
index 944b159..df510ef 100644
--- a/gr-audio/lib/CMakeLists.txt
+++ b/gr-audio/lib/CMakeLists.txt
@@ -26,14 +26,12 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${GR_AUDIO_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 
 link_directories(${Boost_LIBRARY_DIRS})
-link_directories(${LOG4CPP_LIBRARY_DIRS})
 
-list(APPEND gr_audio_libs gnuradio-runtime ${Boost_LIBRARIES} 
${LOG4CPP_LIBRARIES})
+list(APPEND gr_audio_libs gnuradio-runtime ${Boost_LIBRARIES})
 list(APPEND gr_audio_sources audio_registry.cc)
 list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/gr-audio.conf)
 
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt
index 4b130bd..4155958 100644
--- a/gr-blocks/lib/CMakeLists.txt
+++ b/gr-blocks/lib/CMakeLists.txt
@@ -251,7 +251,6 @@ list(APPEND blocks_libs
     gnuradio-runtime
     ${VOLK_LIBRARIES}
     ${Boost_LIBRARIES}
-    ${LOG4CPP_LIBRARIES}
 )
 
 add_library(gnuradio-blocks SHARED ${gr_blocks_sources})
@@ -328,7 +327,6 @@ if(ENABLE_TESTING)
     gnuradio-blocks
     ${Boost_LIBRARIES}
     ${CPPUNIT_LIBRARIES}
-    ${LOG4CPP_LIBRARIES}
   )
 
   GR_ADD_TEST(test_gr_blocks test-gr-blocks)
diff --git a/gr-blocks/tests/CMakeLists.txt b/gr-blocks/tests/CMakeLists.txt
index 8f2b28e..f6b2b50 100644
--- a/gr-blocks/tests/CMakeLists.txt
+++ b/gr-blocks/tests/CMakeLists.txt
@@ -36,9 +36,6 @@ link_directories(
     ${CPPUNIT_LIBRARY_DIRS}
 )
 
-include_directories(${LOG4CPP_INCLUDE_DIRS})
-link_directories(${LOG4CPP_LIBRARY_DIRS})
-
 ########################################################################
 # Build benchmarks and non-registered tests
 ########################################################################
@@ -50,6 +47,5 @@ set(tests_not_run #single source per test
 foreach(test_not_run_src ${tests_not_run})
     get_filename_component(name ${test_not_run_src} NAME_WE)
     add_executable(${name} ${test_not_run_src})
-    target_link_libraries(${name} test-gnuradio-runtime gnuradio-blocks 
${LOG4CPP_LIBRARIES})
+    target_link_libraries(${name} test-gnuradio-runtime gnuradio-blocks)
 endforeach(test_not_run_src)
-
diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt
index 84f53ec..4d57366 100644
--- a/gr-digital/lib/CMakeLists.txt
+++ b/gr-digital/lib/CMakeLists.txt
@@ -29,12 +29,10 @@ include_directories(
     ${GR_BLOCKS_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${VOLK_INCLUDE_DIRS}
-    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 
 link_directories(${Boost_LIBRARY_DIRS})
-link_directories(${LOG4CPP_LIBRARY_DIRS})
 
 if(ENABLE_GR_CTRLPORT)
   ADD_DEFINITIONS(-DGR_CTRLPORT)
@@ -151,7 +149,6 @@ list(APPEND digital_libs
     gnuradio-analog
     ${VOLK_LIBRARIES}
     ${Boost_LIBRARIES}
-    ${LOG4CPP_LIBRARIES}
 )
 
 add_library(gnuradio-digital SHARED ${digital_sources})
@@ -228,7 +225,6 @@ if(ENABLE_TESTING)
     gnuradio-digital
     ${Boost_LIBRARIES}
     ${CPPUNIT_LIBRARIES}
-    ${LOG4CPP_LIBRARIES}
   )
 
   GR_ADD_TEST(test_gr_digital test-gr-digital)
diff --git a/gr-fec/lib/CMakeLists.txt b/gr-fec/lib/CMakeLists.txt
index 3d5509e..8fb802a 100644
--- a/gr-fec/lib/CMakeLists.txt
+++ b/gr-fec/lib/CMakeLists.txt
@@ -32,7 +32,6 @@ include_directories(
     ${GR_BLOCKS_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${VOLK_INCLUDE_DIRS}
-    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 
@@ -42,7 +41,6 @@ endif(ENABLE_GR_CTRLPORT)
 
 link_directories(
   ${Boost_LIBRARY_DIRS}
-  ${LOG4CPP_LIBRARY_DIRS}
 )
 
 ########################################################################
@@ -110,7 +108,6 @@ list(APPEND gnuradio_fec_libs
     gnuradio-runtime
     ${VOLK_LIBRARIES}
     ${Boost_LIBRARIES}
-    ${LOG4CPP_LIBRARIES}
 )
 
 # Only include the LDPC work if we have GSL installed
diff --git a/gr-filter/lib/CMakeLists.txt b/gr-filter/lib/CMakeLists.txt
index feabe73..6847029 100644
--- a/gr-filter/lib/CMakeLists.txt
+++ b/gr-filter/lib/CMakeLists.txt
@@ -37,13 +37,11 @@ include_directories(
     ${GR_BLOCKS_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${VOLK_INCLUDE_DIRS}
-    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 
 link_directories(
   ${Boost_LIBRARY_DIRS}
-  ${LOG4CPP_LIBRARY_DIRS}
 )
 
 if(ENABLE_GR_CTRLPORT)
diff --git a/gr-qtgui/lib/CMakeLists.txt b/gr-qtgui/lib/CMakeLists.txt
index b1ee580..553f27c 100644
--- a/gr-qtgui/lib/CMakeLists.txt
+++ b/gr-qtgui/lib/CMakeLists.txt
@@ -129,7 +129,6 @@ include_directories(
     ${QWT_INCLUDE_DIRS}
     ${QT_INCLUDE_DIRS}
     ${FFTW3F_INCLUDE_DIRS}
-    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${PYTHON_INCLUDE_DIRS}
 )
@@ -137,7 +136,6 @@ include_directories(
 link_directories(
     ${QWT_LIBRARY_DIRS}
     ${FFTW3F_LIBRARY_DIRS}
-    ${LOG4CPP_LIBRARY_DIRS}
     ${Boost_LIBRARY_DIRS}
 )
 
@@ -158,7 +156,6 @@ list(APPEND qtgui_libs
     ${QWT_LIBRARIES}
     ${QT_LIBRARIES}
     ${FFTW3F_LIBRARIES}
-    ${LOG4CPP_LIBRARIES}
 )
 if (WIN32)
   list(APPEND qtgui_libs
diff --git a/gr-uhd/lib/CMakeLists.txt b/gr-uhd/lib/CMakeLists.txt
index 5620290..c662256 100644
--- a/gr-uhd/lib/CMakeLists.txt
+++ b/gr-uhd/lib/CMakeLists.txt
@@ -37,9 +37,6 @@ if(ENABLE_GR_CTRLPORT)
   ADD_DEFINITIONS(-DGR_CTRLPORT)
 endif(ENABLE_GR_CTRLPORT)
 
-include_directories(${LOG4CPP_INCLUDE_DIRS})
-link_directories(${LOG4CPP_LIBRARY_DIRS})
-
 ########################################################################
 # Setup library
 ########################################################################
@@ -68,7 +65,6 @@ list(APPEND uhd_libs
     gnuradio-runtime
     ${Boost_LIBRARIES}
     ${UHD_LIBRARIES}
-    ${LOG4CPP_LIBRARIES}
 )
 
 add_library(gnuradio-uhd SHARED ${gr_uhd_sources})
diff --git a/gr-vocoder/lib/CMakeLists.txt b/gr-vocoder/lib/CMakeLists.txt
index a7c3273..5617d5f 100644
--- a/gr-vocoder/lib/CMakeLists.txt
+++ b/gr-vocoder/lib/CMakeLists.txt
@@ -161,9 +161,6 @@ if(ENABLE_GR_CTRLPORT)
   ADD_DEFINITIONS(-DGR_CTRLPORT)
 endif(ENABLE_GR_CTRLPORT)
 
-include_directories(${LOG4CPP_INCLUDE_DIRS})
-link_directories(${LOG4CPP_LIBRARY_DIRS})
-
 ########################################################################
 # Setup library
 ########################################################################
@@ -217,7 +214,6 @@ endif(GR_USE_LOCAL_LIBGSM)
 list(APPEND vocoder_libs
     gnuradio-runtime
     ${Boost_LIBRARIES}
-    ${LOG4CPP_LIBRARIES}
 )
 
 if(GR_USE_SYSTEM_LIBCODEC2)
diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt
index d091d11..ffeb99e 100644
--- a/gr-wavelet/lib/CMakeLists.txt
+++ b/gr-wavelet/lib/CMakeLists.txt
@@ -39,9 +39,6 @@ if(ENABLE_GR_CTRLPORT)
   ADD_DEFINITIONS(-DGR_CTRLPORT)
 endif(ENABLE_GR_CTRLPORT)
 
-include_directories(${LOG4CPP_INCLUDE_DIRS})
-link_directories(${LOG4CPP_LIBRARY_DIRS})
-
 ########################################################################
 # Setup library
 ########################################################################
@@ -71,7 +68,6 @@ list(APPEND wavelet_libs
     ${Boost_LIBRARIES}
     ${WAVELET_LIBRARIES}
     ${GSL_LIBRARIES}
-    ${LOG4CPP_LIBRARIES}
 )
 
 add_library(gnuradio-wavelet SHARED ${gr_wavelet_sources})



reply via email to

[Prev in Thread] Current Thread [Next in Thread]