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 /cmake/Modules | |
| 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 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/GrSwig.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake index dcdd5a066..175d0d759 100644 --- a/cmake/Modules/GrSwig.cmake +++ b/cmake/Modules/GrSwig.cmake @@ -105,12 +105,15 @@ endfunction(GR_SWIG_MAKE_DOCS) macro(GR_SWIG_MAKE name) set(ifiles ${ARGN}) + list(APPEND GR_SWIG_TARGET_DEPS ${GR_SWIG_LIBRARIES}) + #do swig doc generation if specified if (GR_SWIG_DOC_FILE) set(GR_SWIG_DOCS_SOURCE_DEPS ${GR_SWIG_SOURCE_DEPS}) set(GR_SWIG_DOCS_TAREGT_DEPS ${GR_SWIG_TARGET_DEPS}) GR_SWIG_MAKE_DOCS(${GR_SWIG_DOC_FILE} ${GR_SWIG_DOC_DIRS}) - list(APPEND GR_SWIG_SOURCE_DEPS ${GR_SWIG_DOC_FILE}) + add_custom_target(${name}_swig_doc DEPENDS ${GR_SWIG_DOC_FILE}) + list(APPEND GR_SWIG_TARGET_DEPS ${name}_swig_doc) endif() #append additional include directories |