[Commit-gnuradio] [gnuradio] branch master updated (aab6e83 -> 0d5fd62)

[git]

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

jcorgan pushed a change to branch master
in repository gnuradio.

      from  aab6e83   Merge branch 'maint'
       new  f6b040c   cmake: clean up
       new  51e5655   cmake: add log4cpp to runtime includes
       new  4433a77   cmake: remove duplicate swig includes
       new  6a68b9b   cmake: fix component dependencies
       new  0d5fd62   Merge remote-tracking branch 'gnuradio-github/pr/1195'

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 cmake/Modules/GrSwig.cmake           | 3 ---
 cmake/Modules/UseSWIG.cmake          | 1 +
 gnuradio-runtime/CMakeLists.txt      | 3 +--
 gnuradio-runtime/lib/CMakeLists.txt  | 5 -----
 gnuradio-runtime/swig/CMakeLists.txt | 1 -
 gr-analog/CMakeLists.txt             | 1 +
 gr-audio/lib/CMakeLists.txt          | 4 +---
 gr-blocks/CMakeLists.txt             | 2 ++
 gr-blocks/lib/CMakeLists.txt         | 4 ----
 gr-blocks/tests/CMakeLists.txt       | 6 +-----
 gr-comedi/lib/CMakeLists.txt         | 2 --
 gr-digital/CMakeLists.txt            | 2 --
 gr-digital/lib/CMakeLists.txt        | 4 ----
 gr-dtv/CMakeLists.txt                | 1 +
 gr-dtv/lib/CMakeLists.txt            | 5 -----
 gr-fec/lib/CMakeLists.txt            | 7 ++-----
 gr-fft/CMakeLists.txt                | 1 -
 gr-filter/lib/CMakeLists.txt         | 2 --
 gr-qtgui/lib/CMakeLists.txt          | 3 ---
 gr-trellis/lib/CMakeLists.txt        | 2 --
 gr-uhd/lib/CMakeLists.txt            | 6 ------
 gr-video-sdl/lib/CMakeLists.txt      | 2 --
 gr-vocoder/lib/CMakeLists.txt        | 6 ------
 gr-wavelet/CMakeLists.txt            | 3 ---
 gr-wavelet/lib/CMakeLists.txt        | 7 -------
 gr-wxgui/lib/CMakeLists.txt          | 1 -
 26 files changed, 10 insertions(+), 74 deletions(-)