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 /gnuradio-runtime/lib/pmt/CMakeLists.txt | |
| 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 'gnuradio-runtime/lib/pmt/CMakeLists.txt')
| -rw-r--r-- | gnuradio-runtime/lib/pmt/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnuradio-runtime/lib/pmt/CMakeLists.txt b/gnuradio-runtime/lib/pmt/CMakeLists.txt index 9d191df06a..3c1a2dec03 100644 --- a/gnuradio-runtime/lib/pmt/CMakeLists.txt +++ b/gnuradio-runtime/lib/pmt/CMakeLists.txt @@ -53,8 +53,6 @@ ADD_FILE_DEPENDENCIES( ${PMT_SERIAL_TAGS_H} ) -add_custom_target(pmt_generated DEPENDS ${PMT_SERIAL_TAGS_H}) - ######################################################################## # Generate other pmt stuff ######################################################################## @@ -89,3 +87,6 @@ if(ENABLE_TESTING) ${CMAKE_CURRENT_SOURCE_DIR}/qa_pmt.cc ) endif(ENABLE_TESTING) + +add_custom_target(pmt_generated + DEPENDS ${PMT_SERIAL_TAGS_H} ${CMAKE_CURRENT_BINARY_DIR}/pmt_unv_int.h) |