diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-04-08 16:52:48 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-04-08 16:52:48 -0700 |
| commit | 053111dccdc46d0e6013002192e7d828d393d2a7 (patch) | |
| tree | 28056f315a597c1e18d8ab02b9474d4f246f1359 | |
| parent | 0811fbed937c1ed679c514929728a992b46738a6 (diff) | |
| parent | 62f80e22b22eb076e649fc0aee8bbb2c292fa17b (diff) | |
| download | uhd-053111dccdc46d0e6013002192e7d828d393d2a7.tar.gz uhd-053111dccdc46d0e6013002192e7d828d393d2a7.tar.bz2 uhd-053111dccdc46d0e6013002192e7d828d393d2a7.zip | |
Merge branch 'maint'
| -rw-r--r-- | host/docs/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | host/docs/Doxyfile.in | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/host/docs/CMakeLists.txt b/host/docs/CMakeLists.txt index ed462459c..7f510f58c 100644 --- a/host/docs/CMakeLists.txt +++ b/host/docs/CMakeLists.txt @@ -65,6 +65,7 @@ ENDIF(ENABLE_MANUAL) ######################################################################## LIBUHD_REGISTER_COMPONENT("API/Doxygen" ENABLE_DOXYGEN ON "DOXYGEN_FOUND" OFF OFF) OPTION(ENABLE_DOXYGEN_FULL "Use Doxygen to document the entire source tree (not just API)" OFF) +OPTION(ENABLE_DOXYGEN_DOT "Let Doxygen use dot (requires graphviz)" OFF) IF(LIBUHDDEV_PKG) SET(PKG_DOC_DIR share/doc/libuhd-dev) @@ -92,6 +93,12 @@ ENDIF(ENABLE_DOXYGEN) IF(ENABLE_MANUAL_OR_DOXYGEN) #generate the doxygen configuration file SET(CMAKE_CURRENT_BINARY_DIR_DOXYGEN ${CMAKE_CURRENT_BINARY_DIR}/doxygen) + IF(ENABLE_DOXYGEN_DOT) + SET(DOXYGEN_HAVE_DOT "YES") + ELSE(ENABLE_DOXYGEN_DOT) + SET(DOXYGEN_HAVE_DOT "NO") + ENDIF(ENABLE_DOXYGEN_DOT) + CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile diff --git a/host/docs/Doxyfile.in b/host/docs/Doxyfile.in index d984b6f6b..8aa6299ae 100644 --- a/host/docs/Doxyfile.in +++ b/host/docs/Doxyfile.in @@ -1686,7 +1686,7 @@ HIDE_UNDOC_RELATIONS = YES # toolkit from AT&T and Lucent Bell Labs. The other options in this section # have no effect if this option is set to NO (the default) -HAVE_DOT = NO +HAVE_DOT = @DOXYGEN_HAVE_DOT@ # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is # allowed to run in parallel. When set to 0 (the default) doxygen will |