diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-04-07 10:44:17 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-07 10:44:17 -0400 |
| commit | 104aa2b5827ccc7c30baff7bff139ab7a85fa9f9 (patch) | |
| tree | 11d14819dc6e32a0546ff960a5a5a7d676796d5c /docs/doxygen | |
| parent | 0fa5d821e0bb6d98388a0bf766837cbd6c73451f (diff) | |
| parent | dd387a3708196f382f0c1e8041077bf94038ae98 (diff) | |
Merge branch 'master' into next
Also updating to make changes in maint/master to next.
Conflicts:
docs/doxygen/CMakeLists.txt
gnuradio-runtime/lib/pmt/CMakeLists.txt
gr-digital/lib/digital_impl_mpsk_snr_est.cc
gr-digital/lib/digital_mpsk_snr_est_cc.cc
gr-digital/python/qa_mpsk_snr_est.py
Diffstat (limited to 'docs/doxygen')
| -rw-r--r-- | docs/doxygen/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/doxygen/CMakeLists.txt b/docs/doxygen/CMakeLists.txt index 5b5de2f4dd..8498511f9d 100644 --- a/docs/doxygen/CMakeLists.txt +++ b/docs/doxygen/CMakeLists.txt @@ -36,7 +36,10 @@ configure_file( @ONLY) set(BUILT_DIRS ${CMAKE_CURRENT_BINARY_DIR}/xml ${CMAKE_CURRENT_BINARY_DIR}/html) -set(GENERATED_DEPS pmt_generated) + +if(ENABLE_GNURADIO_RUNTIME) + list(APPEND GENERATED_DEPS pmt_generated) +endif(ENABLE_GNURADIO_RUNTIME) if(ENABLE_GR_BLOCKS) list(APPEND GENERATED_DEPS blocks_generated_includes) |