diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-07-03 14:21:05 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-07-03 14:21:05 -0700 |
| commit | 76258270f53da9a7b6bdeed0b38dde735956012e (patch) | |
| tree | fa9f6f1e69d07d5aacdf69f3cd74a0ff5f288264 /gruel/src | |
| parent | 744ffd50ac5a73ce3619ae11ef9cf04c0886d74a (diff) | |
swig: added additional swig dependencies gruel/core
pmt swig gen depends upon the generated header
core depends upon pmt swig custom target
Conflicts:
gruel/src/swig/CMakeLists.txt
Diffstat (limited to 'gruel/src')
| -rw-r--r-- | gruel/src/lib/pmt/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gruel/src/swig/CMakeLists.txt | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gruel/src/lib/pmt/CMakeLists.txt b/gruel/src/lib/pmt/CMakeLists.txt index 72bd27a046..6ea616e107 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 f9d1758ec4..9686225874 100644 --- a/gruel/src/swig/CMakeLists.txt +++ b/gruel/src/swig/CMakeLists.txt @@ -23,7 +23,8 @@ include(GrPython) include(GrSwig) -set(GR_SWIG_INCLUDE_DIRS ${GRUEL_INCLUDE_DIRS}) +set(GR_SWIG_TARGET_DEPS pmt_generated) +set(GR_SWIG_INCLUDE_DIRS ${GRUEL_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}) set(GR_SWIG_LIBRARIES gruel) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/pmt_swig_doc.i) @@ -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}) |