diff options
author | Tom Rondeau <trondeau@vt.edu> | 2013-04-05 12:32:37 -0400 |
---|---|---|
committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-05 12:32:37 -0400 |
commit | 318660963ef29a7afa6372f6d636d16a7139ed3e (patch) | |
tree | 255bca2506a9af93d5f6cd6f5ca931411821c2b5 /docs/doxygen | |
parent | e772651919d7fd64d80f8b618bfcf73f4384c068 (diff) | |
parent | 2bb44bd7864e2f4033d522a9e6d88c732e6471f3 (diff) |
Merge branch 'master' into next
Conflicts:
docs/doxygen/CMakeLists.txt
gr-blocks/swig/CMakeLists.txt
Diffstat (limited to 'docs/doxygen')
-rw-r--r-- | docs/doxygen/CMakeLists.txt | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/docs/doxygen/CMakeLists.txt b/docs/doxygen/CMakeLists.txt index d0f2896cca..e9c17456ee 100644 --- a/docs/doxygen/CMakeLists.txt +++ b/docs/doxygen/CMakeLists.txt @@ -36,9 +36,31 @@ configure_file( @ONLY) set(BUILT_DIRS ${CMAKE_CURRENT_BINARY_DIR}/xml ${CMAKE_CURRENT_BINARY_DIR}/html) -set(GENERATED_DEPS pmt_generated - analog_generated_includes blocks_generated_includes digital_generated_includes - fec_generated_includes filter_generated_includes trellis_generated_includes) +set(GENERATED_DEPS pmt_generated) + +if(ENABLE_GR_BLOCKS) + list(APPEND GENERATED_DEPS blocks_generated_includes) +endif(ENABLE_GR_BLOCKS) + +if(ENABLE_GR_ANALOG) + list(APPEND GENERATED_DEPS analog_generated_includes) +endif(ENABLE_GR_ANALOG) + +if(ENABLE_GR_DIGITAL) + list(APPEND GENERATED_DEPS digital_generated_includes) +endif(ENABLE_GR_DIGITAL) + +if(ENABLE_GR_FEC) + list(APPEND GENERATED_DEPS fec_generated_includes) +endif(ENABLE_GR_FILTER) + +if(ENABLE_GR_FILTER) + list(APPEND GENERATED_DEPS filter_generated_includes) +endif(ENABLE_GR_FILTER) + +if(ENABLE_GR_TRELLIS) + list(APPEND GENERATED_DEPS trellis_generated_includes) +endif(ENABLE_GR_TRELLIS) ######################################################################## # Make and install doxygen docs |