diff options
| author | Tom Rondeau | 2012-03-16 16:57:38 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2012-03-16 16:57:38 -0400 |
| commit | fcdac045ad64099949dbbefff25832a6dcef3187 (patch) | |
| tree | f0f793f25b942f2f83f2cd754b3b924f9593dfcf /gruel/src/swig/CMakeLists.txt | |
| parent | b5dbeb3f02b7e230f0e8fd49640047a04c6908b6 (diff) | |
| parent | 74f7c070339a3bb4ba2b6f2e17c66583ba4c0104 (diff) | |
| download | gnuradio-fcdac045ad64099949dbbefff25832a6dcef3187.tar.gz gnuradio-fcdac045ad64099949dbbefff25832a6dcef3187.tar.bz2 gnuradio-fcdac045ad64099949dbbefff25832a6dcef3187.zip | |
Merge branch 'master' into next
Conflicts:
gruel/src/swig/Makefile.am
Diffstat (limited to 'gruel/src/swig/CMakeLists.txt')
| -rw-r--r-- | gruel/src/swig/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gruel/src/swig/CMakeLists.txt b/gruel/src/swig/CMakeLists.txt index 7d69ee549..6f636fc3f 100644 --- a/gruel/src/swig/CMakeLists.txt +++ b/gruel/src/swig/CMakeLists.txt @@ -38,7 +38,7 @@ GR_SWIG_INSTALL( ) install( - FILES gr_intrusive_ptr.i pmt_swig.i + FILES gr_intrusive_ptr.i pmt_swig.i gruel_common.i ${CMAKE_CURRENT_BINARY_DIR}/pmt_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig COMPONENT "gruel_swig" |