[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/05: cmake: clean up
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/05: cmake: clean up |
|
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 f6b040c62eb969c4b4ae0298ccfffce6bbfe1871
Author: Bastian Bloessl <address@hidden>
Date: Sun Jan 29 10:27:29 2017 +0100
cmake: clean up
---
gnuradio-runtime/CMakeLists.txt | 2 --
gnuradio-runtime/lib/CMakeLists.txt | 5 -----
gr-blocks/lib/CMakeLists.txt | 1 -
gr-comedi/lib/CMakeLists.txt | 2 --
gr-digital/CMakeLists.txt | 2 --
gr-dtv/lib/CMakeLists.txt | 5 -----
gr-fec/lib/CMakeLists.txt | 4 ++--
gr-fft/CMakeLists.txt | 1 -
gr-trellis/lib/CMakeLists.txt | 2 --
gr-uhd/lib/CMakeLists.txt | 2 --
gr-video-sdl/lib/CMakeLists.txt | 2 --
gr-vocoder/lib/CMakeLists.txt | 2 --
gr-wavelet/CMakeLists.txt | 3 ---
gr-wavelet/lib/CMakeLists.txt | 3 ---
gr-wxgui/lib/CMakeLists.txt | 1 -
15 files changed, 2 insertions(+), 35 deletions(-)
diff --git a/gnuradio-runtime/CMakeLists.txt b/gnuradio-runtime/CMakeLists.txt
index 17fc61e..1bee143 100644
--- a/gnuradio-runtime/CMakeLists.txt
+++ b/gnuradio-runtime/CMakeLists.txt
@@ -137,11 +137,9 @@ endif(ENABLE_GR_LOG AND HAVE_LOG4CPP)
add_subdirectory(include)
add_subdirectory(lib)
add_subdirectory(apps)
-#add_subdirectory(doc)
if(ENABLE_PYTHON)
add_subdirectory(swig)
add_subdirectory(python)
-# add_subdirectory(grc)
add_subdirectory(examples)
endif(ENABLE_PYTHON)
diff --git a/gnuradio-runtime/lib/CMakeLists.txt
b/gnuradio-runtime/lib/CMakeLists.txt
index 3da550d..1180ebe 100644
--- a/gnuradio-runtime/lib/CMakeLists.txt
+++ b/gnuradio-runtime/lib/CMakeLists.txt
@@ -44,11 +44,6 @@ configure_file(
list(APPEND gnuradio_runtime_sources ${CMAKE_CURRENT_BINARY_DIR}/constants.cc)
########################################################################
-# Include subdirs rather to populate to the sources lists.
-########################################################################
-#GR_INCLUDE_SUBDIRECTORY(foo)
-
-########################################################################
# Setup the include and linker paths
########################################################################
include_directories(${GNURADIO_RUNTIME_INCLUDE_DIRS}
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt
index 1d69f27..4b130bd 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}
- ${BLOCKS_LIBRARIES}
${LOG4CPP_LIBRARIES}
)
diff --git a/gr-comedi/lib/CMakeLists.txt b/gr-comedi/lib/CMakeLists.txt
index e6e58dc..105ba0a 100644
--- a/gr-comedi/lib/CMakeLists.txt
+++ b/gr-comedi/lib/CMakeLists.txt
@@ -23,13 +23,11 @@
include_directories(
${GR_COMEDI_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
- ${LOG4CXX_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${COMEDI_INCLUDE_DIRS}
)
link_directories(
- ${LOG4CXX_LIBRARY_DIRS}
${Boost_LIBRARY_DIRS}
${COMEDI_LIBRARY_DIRS}
)
diff --git a/gr-digital/CMakeLists.txt b/gr-digital/CMakeLists.txt
index c6fa079..5edf96e 100644
--- a/gr-digital/CMakeLists.txt
+++ b/gr-digital/CMakeLists.txt
@@ -34,8 +34,6 @@ GR_REGISTER_COMPONENT("gr-digital" ENABLE_GR_DIGITAL
ENABLE_GR_FILTER
ENABLE_GR_BLOCKS
ENABLE_GR_ANALOG
- ENABLE_GR_BLOCKS
- ENABLE_GR_FILTER
)
GR_SET_GLOBAL(GR_DIGITAL_INCLUDE_DIRS
diff --git a/gr-dtv/lib/CMakeLists.txt b/gr-dtv/lib/CMakeLists.txt
index 4aa6d49..18043fd 100644
--- a/gr-dtv/lib/CMakeLists.txt
+++ b/gr-dtv/lib/CMakeLists.txt
@@ -100,11 +100,6 @@ list(APPEND dtv_sources
catv/catv_trellis_enc_bb_impl.cc
)
-if(ENABLE_GR_CTRLPORT)
-list(APPEND dtv_sources
-)
-endif(ENABLE_GR_CTRLPORT)
-
list(APPEND dtv_libs
gnuradio-runtime
gnuradio-analog
diff --git a/gr-fec/lib/CMakeLists.txt b/gr-fec/lib/CMakeLists.txt
index bda9801..3d5509e 100644
--- a/gr-fec/lib/CMakeLists.txt
+++ b/gr-fec/lib/CMakeLists.txt
@@ -87,8 +87,8 @@ list(APPEND gnuradio_fec_sources
polar_decoder_sc_list.cc
polar_decoder_common.cc
scl_list.cc
- polar_encoder_systematic.cc
- polar_decoder_sc_systematic.cc
+ polar_encoder_systematic.cc
+ polar_decoder_sc_systematic.cc
)
#Add Windows DLL resource file if using MSVC
diff --git a/gr-fft/CMakeLists.txt b/gr-fft/CMakeLists.txt
index 586abe5..c0c4ae1 100644
--- a/gr-fft/CMakeLists.txt
+++ b/gr-fft/CMakeLists.txt
@@ -91,7 +91,6 @@ if(ENABLE_PYTHON)
add_subdirectory(python/fft)
add_subdirectory(grc)
endif(ENABLE_PYTHON)
-#add_subdirectory(examples)
add_subdirectory(doc)
########################################################################
diff --git a/gr-trellis/lib/CMakeLists.txt b/gr-trellis/lib/CMakeLists.txt
index 9c51d06..a5b3cf0 100644
--- a/gr-trellis/lib/CMakeLists.txt
+++ b/gr-trellis/lib/CMakeLists.txt
@@ -25,12 +25,10 @@ include_directories(
${GR_TRELLIS_INCLUDE_DIRS}
${GR_DIGITAL_INCLUDE_DIRS}
${GNURADIO_RUNTIME_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)
diff --git a/gr-uhd/lib/CMakeLists.txt b/gr-uhd/lib/CMakeLists.txt
index be77e22..5620290 100644
--- a/gr-uhd/lib/CMakeLists.txt
+++ b/gr-uhd/lib/CMakeLists.txt
@@ -25,13 +25,11 @@ include_directories(
${GR_UHD_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
${UHD_INCLUDE_DIRS}
- ${LOG4CXX_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
)
link_directories(
${UHD_LIBRARY_DIRS}
- ${LOG4CXX_LIBRARY_DIRS}
${Boost_LIBRARY_DIRS}
)
diff --git a/gr-video-sdl/lib/CMakeLists.txt b/gr-video-sdl/lib/CMakeLists.txt
index 42ad24e..8c80dcf 100644
--- a/gr-video-sdl/lib/CMakeLists.txt
+++ b/gr-video-sdl/lib/CMakeLists.txt
@@ -23,12 +23,10 @@
include_directories(
${GR_VIDEO_SDL_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
- ${LOG4CXX_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${SDL_INCLUDE_DIR}
)
-link_directories(${LOG4CXX_LIBRARY_DIRS})
link_directories(${Boost_LIBRARY_DIRS})
if(ENABLE_GR_CTRLPORT)
diff --git a/gr-vocoder/lib/CMakeLists.txt b/gr-vocoder/lib/CMakeLists.txt
index a347cbf..a7c3273 100644
--- a/gr-vocoder/lib/CMakeLists.txt
+++ b/gr-vocoder/lib/CMakeLists.txt
@@ -152,11 +152,9 @@ mark_as_advanced(LIBCODEC2_INCLUDE_DIR LIBCODEC2_LIBRARIES)
include_directories(
${GR_VOCODER_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
- ${LOG4CXX_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
)
-link_directories(${LOG4CXX_LIBRARY_DIRS})
link_directories(${Boost_LIBRARY_DIRS})
if(ENABLE_GR_CTRLPORT)
diff --git a/gr-wavelet/CMakeLists.txt b/gr-wavelet/CMakeLists.txt
index bdc19a1..716ef77 100644
--- a/gr-wavelet/CMakeLists.txt
+++ b/gr-wavelet/CMakeLists.txt
@@ -89,10 +89,7 @@ add_subdirectory(lib)
if(ENABLE_PYTHON)
add_subdirectory(swig)
add_subdirectory(python/wavelet)
-# add_subdirectory(grc)
endif(ENABLE_PYTHON)
-#add_subdirectory(examples)
-#add_subdirectory(doc)
########################################################################
# Create Pkg Config File
diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt
index be2a7a8..d091d11 100644
--- a/gr-wavelet/lib/CMakeLists.txt
+++ b/gr-wavelet/lib/CMakeLists.txt
@@ -26,14 +26,11 @@ include_directories(
${GR_WAVELET_INCLUDE_DIRS}
${GR_BLOCKS_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
- ${LOG4CXX_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})
add_definitions(${GSL_DEFINITIONS})
diff --git a/gr-wxgui/lib/CMakeLists.txt b/gr-wxgui/lib/CMakeLists.txt
index d4c2441..fcf4347 100644
--- a/gr-wxgui/lib/CMakeLists.txt
+++ b/gr-wxgui/lib/CMakeLists.txt
@@ -64,7 +64,6 @@ list(APPEND wxgui_libs
gnuradio-runtime
${VOLK_LIBRARIES}
${Boost_LIBRARIES}
- ${BLOCKS_LIBRARIES}
${LOG4CPP_LIBRARIES}
)