[Commit-gnuradio] [gnuradio] branch master updated (1c9377b -> 4eb84b1)

[git]

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

jcorgan pushed a change to branch master
in repository gnuradio.

      from  1c9377b   Merge remote-tracking branch 
'gnuradio-wg-grc/master_grcwg'
       new  c8fcd02   cmake: fix FindUHD.cmake to work better wit CMake 2.6, 
and in general.
       new  0bab1f9   Merge remote-tracking branch 'michaelld/refix_findUHD'
       new  43a990f   cmake: fix setting and usage of CMAKE_MODULES_DIR
       new  64f85b3   cmake: whitespace only
       new  0c10990   cmake: on APPLE only, add defaults for rpath and install 
name info for libraries
       new  4eb84b1   Merge remote-tracking branch 'michaelld/cmake_fixes'

The 6 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:
 CMakeLists.txt              | 24 ++++++++++++++++++++++--
 cmake/Modules/FindUHD.cmake | 17 +++++++++--------
 cmake/Modules/GrSwig.cmake  |  6 +++---
 volk/CMakeLists.txt         | 27 ++++++++++++++++++++++++++-
 4 files changed, 60 insertions(+), 14 deletions(-)