diff options
| author | Johnathan Corgan | 2012-11-22 11:17:03 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2012-11-22 11:17:03 -0800 |
| commit | 8dcd5f361188df9181d047111c11534058081a92 (patch) | |
| tree | fa620ea0ac1df6152bcbfae0eed6ea99767f7f95 | |
| parent | 4eec94a051007230becf30ebb1704b1f4ea5dc73 (diff) | |
| parent | b71c875803986664611d2988193f2768bf08f207 (diff) | |
| download | gnuradio-8dcd5f361188df9181d047111c11534058081a92.tar.gz gnuradio-8dcd5f361188df9181d047111c11534058081a92.tar.bz2 gnuradio-8dcd5f361188df9181d047111c11534058081a92.zip | |
Merge branch 'maint'
| -rw-r--r-- | gr-filter/examples/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | gruel/CMakeLists.txt | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gr-filter/examples/CMakeLists.txt b/gr-filter/examples/CMakeLists.txt index d94e5c16e..84a93d55f 100644 --- a/gr-filter/examples/CMakeLists.txt +++ b/gr-filter/examples/CMakeLists.txt @@ -31,9 +31,15 @@ GR_PYTHON_INSTALL(PROGRAMS interpolate.py reconstruction.py resampler.py - resampler_demo.grc synth_filter.py synth_to_chan.py DESTINATION ${GR_PKG_FILTER_EXAMPLES_DIR} COMPONENT "filter_python" ) + +install( + FILES + resampler_demo.grc + DESTINATION ${GR_PKG_FILTER_EXAMPLES_DIR} + COMPONENT "filter_python" +) diff --git a/gruel/CMakeLists.txt b/gruel/CMakeLists.txt index 3e8c5166e..627135abe 100644 --- a/gruel/CMakeLists.txt +++ b/gruel/CMakeLists.txt @@ -37,7 +37,6 @@ include(GrMiscUtils) GR_SET_GLOBAL(GRUEL_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src/include ${CMAKE_CURRENT_BINARY_DIR}/src/include - ${Boost_INCLUDE_DIRS} ) ######################################################################## |