diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-09-22 16:27:32 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-09-22 16:27:32 -0700 |
| commit | 41607a1c79824d2058c66fa71894ec181503c391 (patch) | |
| tree | ba7ba51e4d91472b72f65eabdf43c6fa3fd63947 | |
| parent | 1ca375a1abdba35e34c42603e25d5d0118a639d2 (diff) | |
| parent | 80025b8c2cb398a0ccd467b36e5e0b0c43bab7d8 (diff) | |
Merge remote-tracking branch 'github/pr/1464' into python3
| -rw-r--r-- | gnuradio-runtime/swig/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | grc/blocks/CMakeLists.txt | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/gnuradio-runtime/swig/CMakeLists.txt b/gnuradio-runtime/swig/CMakeLists.txt index aeb95dfb72..9135f311c6 100644 --- a/gnuradio-runtime/swig/CMakeLists.txt +++ b/gnuradio-runtime/swig/CMakeLists.txt @@ -104,6 +104,7 @@ install( msg_queue.i pmt_swig.i prefs.i + py3compat.i realtime.i sync_block.i sync_decimator.i diff --git a/grc/blocks/CMakeLists.txt b/grc/blocks/CMakeLists.txt index d46b1febbe..2dbc7c6d0d 100644 --- a/grc/blocks/CMakeLists.txt +++ b/grc/blocks/CMakeLists.txt @@ -20,6 +20,7 @@ ######################################################################## include(GrPython) +file(GLOB yml_files "*.yml") file(GLOB xml_files "*.xml") macro(REPLACE_IN_FILE _xml_block match replace) @@ -54,6 +55,6 @@ endif() add_custom_target(grc_generated_xml ALL DEPENDS ${generated_xml_files}) install( - FILES ${xml_files} ${generated_xml_files} + FILES ${yml_files} ${xml_files} ${generated_xml_files} DESTINATION ${GRC_BLOCKS_DIR} ) |