[Commit-gnuradio] [gnuradio] 12/16: Merge branch 'maint'

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit a7c7324edfa4e04cfc9415d53081367780ba92d9
Merge: 4c90837 e1f860c
Author: Tom Rondeau <address@hidden>
Date:   Sun Feb 16 11:45:06 2014 -0500

    Merge branch 'maint'

 gr-digital/examples/ofdm/rx_ofdm.grc               | 518 +++++++++++++--------
 gr-digital/grc/digital_block_tree.xml              |   1 -
 gr-digital/grc/digital_bytes_to_syms.xml           |  20 -
 gr-qtgui/lib/spectrumdisplayform.ui                |   1 -
 .../python/modtool/gr-newmod/lib/CMakeLists.txt    |   6 +
 .../python/modtool/gr-newmod/swig/CMakeLists.txt   |   8 +
 6 files changed, 327 insertions(+), 227 deletions(-)

diff --cc gr-utils/python/modtool/gr-newmod/lib/CMakeLists.txt
index 05e1fcf,a535ead..6192c51
--- a/gr-utils/python/modtool/gr-newmod/lib/CMakeLists.txt
+++ b/gr-utils/python/modtool/gr-newmod/lib/CMakeLists.txt
@@@ -28,16 -28,16 +28,22 @@@ link_directories(${Boost_LIBRARY_DIRS}
  list(APPEND howto_sources
  )
  
+ set(howto_sources "${howto_sources}" PARENT_SCOPE)
+ if(NOT howto_sources)
+       MESSAGE(STATUS "No C++ sources... skipping lib/")
+       return()
+ endif(NOT howto_sources)
+ 
  add_library(gnuradio-howto SHARED ${howto_sources})
 -target_link_libraries(gnuradio-howto ${Boost_LIBRARIES} 
${GNURADIO_RUNTIME_LIBRARIES})
 +target_link_libraries(gnuradio-howto ${Boost_LIBRARIES} 
${GNURADIO_ALL_LIBRARIES})
  set_target_properties(gnuradio-howto PROPERTIES DEFINE_SYMBOL 
"gnuradio_howto_EXPORTS")
  
 +if(APPLE)
 +    set_target_properties(gnuradio-howto PROPERTIES
 +        INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
 +    )
 +endif(APPLE)
 +
  ########################################################################
  # Install built library files
  ########################################################################