[Commit-gnuradio] [gnuradio] branch master updated (687c637 -> c3a55f7)

[git]

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

jcorgan pushed a change to branch master
in repository gnuradio.

      from  687c637   Merge branch 'maint'
       new  037ddca   cmake: FindUHD: add in checks to see whether 
UHDConfig*.cmake were used via the ENV variables; CACHE variables are 
unreliable from withing UHDConfig*.cmake for some reason.  In the case where 
UHDConfig*.cmake were used, do not do checking for UHD here.  Print out 
appropriate errors if REQUIRED is set.
       new  51d4428   cmake: gr-dtv: fix internal GR component dependencies
       new  7426fa4   cmake: OSS is not for APPLE or WINDOWS.
       new  070887e   cmake: Use APPLE, not matching Darwin
       new  1c56421   cmake: modtool: allow the use of a MODULES_DIR to specify 
where cmake modules are installed.
       new  c7e2ae4   cmake: modtool: On Apple only, set install name and use 
rpath correctly.
       new  a2d11e9   cmake: modtool: make sure our local CMake Modules path 
comes first.
       new  c80fcdb   cmake: modtool: update copyright date.
       new  e6fe716   Merge branch 'maint'
       new  c3a55f7   cmake: modtool: update Modules to GR master

The 10 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/FindOSS.cmake                        |   5 +
 cmake/Modules/FindUHD.cmake                        |  24 +-
 gr-dtv/CMakeLists.txt                              |   3 +
 gr-utils/python/modtool/gr-newmod/CMakeLists.txt   |  32 +-
 .../gr-newmod/cmake/Modules/FindCppUnit.cmake      |   3 +
 .../gr-newmod/cmake/Modules/GrMiscUtils.cmake      | 321 ++++++++++++++++++++-
 .../gr-newmod/cmake/Modules/GrPlatform.cmake       |  10 +-
 .../modtool/gr-newmod/cmake/Modules/GrPython.cmake |  25 +-
 .../modtool/gr-newmod/cmake/Modules/GrSwig.cmake   |  50 +++-
 .../modtool/gr-newmod/cmake/Modules/GrTest.cmake   |  22 +-
 gr-wavelet/lib/CMakeLists.txt                      |   5 +-
 11 files changed, 456 insertions(+), 44 deletions(-)