diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-04-30 11:36:41 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-04-30 11:36:41 -0700 |
| commit | ed632e6a9b36355202cfd2eac5322664387d43c4 (patch) | |
| tree | 26fcc61ebd82338e84fba9df94ccfd9a1752febd | |
| parent | b3bfba0f3e4afedd98e330e542975db796d298b1 (diff) | |
| parent | 4efa67ffcdedd68f77d8df439d433597a5744059 (diff) | |
| download | uhd-ed632e6a9b36355202cfd2eac5322664387d43c4.tar.gz uhd-ed632e6a9b36355202cfd2eac5322664387d43c4.tar.bz2 uhd-ed632e6a9b36355202cfd2eac5322664387d43c4.zip | |
Merge branch 'maint'
| -rw-r--r-- | host/docs/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | host/docs/Doxyfile.in | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/host/docs/CMakeLists.txt b/host/docs/CMakeLists.txt index 9540ef28e..a73d39356 100644 --- a/host/docs/CMakeLists.txt +++ b/host/docs/CMakeLists.txt @@ -45,13 +45,15 @@ IF(ENABLE_MANUAL) SET(DOXYGEN_INPUT_DIRS "${CMAKE_SOURCE_DIR}/docs") SET(DOXYGEN_DEP_COMPONENT "manual") SET(DOXYGEN_FPGA_MANUAL_REFERENCE "<a href=\"http://files.ettus.com/manual/page_fpga.html\">Part III: FPGA Manual</a>") + SET(DOXYGEN_STRIP_EXTRA "") # Now, check if we have the FPGA sources as well. # If so, pull them in: IF(HAS_FPGA_SUBMODULE) FILE(GLOB_RECURSE fpga_manual_sources "${FPGA_SUBMODULE_DIR}/docs/*.md") LIST(APPEND manual_sources ${fpga_manual_sources}) SET(DOXYGEN_INPUT_DIRS "${DOXYGEN_INPUT_DIRS} ${FPGA_SUBMODULE_DIR}/docs") - SET(DOXYGEN_FPGA_MANUAL_REFERENCE "\\subpage page_fpga \"Part III: FPGA Manual\"") + SET(DOXYGEN_FPGA_MANUAL_REFERENCE "\\subpage md_fpga \"Part III: FPGA Manual\"") + SET(DOXYGEN_STRIP_EXTRA "${FPGA_SUBMODULE_DIR}/docs") ENDIF(HAS_FPGA_SUBMODULE) message(STATUS ${manual_sources}) CONFIGURE_FILE( diff --git a/host/docs/Doxyfile.in b/host/docs/Doxyfile.in index bca3b71d1..0f0a5cc27 100644 --- a/host/docs/Doxyfile.in +++ b/host/docs/Doxyfile.in @@ -132,7 +132,7 @@ FULL_PATH_NAMES = YES # relative paths, which will be relative from the directory where doxygen is # started. -STRIP_FROM_PATH = @CMAKE_SOURCE_DIR@ @FPGA_SUBMODULE_DIR@ +STRIP_FROM_PATH = @CMAKE_SOURCE_DIR@ @DOXYGEN_STRIP_EXTRA@ # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of # the path mentioned in the documentation of a class, which tells |