diff options
| author | Johnathan Corgan | 2012-07-03 17:14:56 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-07-03 17:14:56 -0700 |
| commit | 791eb5decfd028372a7f24b4056dac95a5fba5e5 (patch) | |
| tree | 29078d6ffcb6f3c92fc7ad88763d52ae601ae7fb /gruel | |
| parent | eb2505b637075e75cafa700350d5b9297e1b7ef3 (diff) | |
| parent | 86dd49f2b301fdd7e817632eeb2dcaf25c86af4c (diff) | |
| download | gnuradio-791eb5decfd028372a7f24b4056dac95a5fba5e5.tar.gz gnuradio-791eb5decfd028372a7f24b4056dac95a5fba5e5.tar.bz2 gnuradio-791eb5decfd028372a7f24b4056dac95a5fba5e5.zip | |
Merge branch 'maint'
Conflicts:
gruel/src/swig/CMakeLists.txt
Diffstat (limited to 'gruel')
| -rw-r--r-- | gruel/src/lib/pmt/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gruel/src/swig/CMakeLists.txt | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gruel/src/lib/pmt/CMakeLists.txt b/gruel/src/lib/pmt/CMakeLists.txt index 72bd27a04..6ea616e10 100644 --- a/gruel/src/lib/pmt/CMakeLists.txt +++ b/gruel/src/lib/pmt/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2010 Free Software Foundation, Inc. +# Copyright 2010-2012 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -53,6 +53,8 @@ ADD_FILE_DEPENDENCIES( ${PMT_SERIAL_TAGS_H} ) +add_custom_target(pmt_generated DEPENDS ${PMT_SERIAL_TAGS_H}) + ######################################################################## # Generate other pmt stuff ######################################################################## diff --git a/gruel/src/swig/CMakeLists.txt b/gruel/src/swig/CMakeLists.txt index a0f84c832..332d5866f 100644 --- a/gruel/src/swig/CMakeLists.txt +++ b/gruel/src/swig/CMakeLists.txt @@ -23,6 +23,7 @@ include(GrPython) include(GrSwig) +set(GR_SWIG_TARGET_DEPS pmt_generated) set(GR_SWIG_INCLUDE_DIRS ${GRUEL_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}) set(GR_SWIG_LIBRARIES gruel) @@ -43,3 +44,5 @@ install( DESTINATION ${GR_INCLUDE_DIR}/gruel/swig COMPONENT "gruel_swig" ) + +add_custom_target(pmt_swig DEPENDS ${SWIG_MODULE_pmt_swig_REAL_NAME}) |