diff options
| author | Josh Blum <josh@joshknows.com> | 2011-01-04 16:50:18 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-01-04 16:50:18 -0800 |
| commit | 78085d3c101e0dbaf95393904c8c06ca5279cc42 (patch) | |
| tree | 10372369d97f5c7baef0c35c2dd1558444ed8496 /host/docs | |
| parent | fabfa8d9dd6670afb9c621b9ee12f8d602d7ccda (diff) | |
| parent | df11c4d378ebe11ba4864d5a28559b8cb4af98c4 (diff) | |
| download | uhd-78085d3c101e0dbaf95393904c8c06ca5279cc42.tar.gz uhd-78085d3c101e0dbaf95393904c8c06ca5279cc42.tar.bz2 uhd-78085d3c101e0dbaf95393904c8c06ca5279cc42.zip | |
Merge branch 'buffer_pool' into next
Diffstat (limited to 'host/docs')
| -rw-r--r-- | host/docs/CMakeLists.txt | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/host/docs/CMakeLists.txt b/host/docs/CMakeLists.txt index 54e0d589c..592d66526 100644 --- a/host/docs/CMakeLists.txt +++ b/host/docs/CMakeLists.txt @@ -36,17 +36,9 @@ SET(manual_sources # Setup Manual ######################################################################## MESSAGE(STATUS "") -MESSAGE(STATUS "Checking for rst2html (docutils)") -FIND_PROGRAM(RST2HTML rst2html) -IF(RST2HTML) - MESSAGE(STATUS "Checking for rst2html (docutils) - found") - MESSAGE(STATUS " Enabled generation of HTML manual.") -ELSE(RST2HTML) - MESSAGE(STATUS "Checking for rst2html (docutils) - not found") - MESSAGE(STATUS " Disabled generation of HTML manual.") -ENDIF(RST2HTML) +FIND_PACKAGE(Docutils REQUIRED) -LIBUHD_REGISTER_COMPONENT("Manual" ENABLE_MANUAL ON "RST2HTML" OFF) +LIBUHD_REGISTER_COMPONENT("Manual" ENABLE_MANUAL ON "DOCUTILS_FOUND" OFF) IF(ENABLE_MANUAL) #setup rst2html options @@ -66,7 +58,7 @@ IF(ENABLE_MANUAL) #make the html file depend on the rst file ADD_CUSTOM_COMMAND( OUTPUT ${htmlfile} DEPENDS ${rstfile} ${stylesheet} - COMMAND ${RST2HTML} ${rstfile} ${htmlfile} ${rst2html_options} + COMMAND ${RST2HTML_EXECUTABLE} ${rstfile} ${htmlfile} ${rst2html_options} COMMENT "Generating ${htmlfile}" ) @@ -85,14 +77,11 @@ INSTALL(FILES ${manual_sources} DESTINATION ${PKG_DOC_DIR}/manual/rst) # Setup Doxygen ######################################################################## MESSAGE(STATUS "") -MESSAGE(STATUS "Checking for doxygen") -INCLUDE(FindDoxygen) +FIND_PACKAGE(Doxygen) LIBUHD_REGISTER_COMPONENT("Doxygen" ENABLE_DOXYGEN ON "DOXYGEN_FOUND" OFF) IF(ENABLE_DOXYGEN) - MESSAGE(STATUS " Enabled generation of Doxygen documentation.") - #generate the doxygen configuration file SET(CMAKE_CURRENT_BINARY_DIR_DOXYGEN ${CMAKE_CURRENT_BINARY_DIR}/doxygen) CONFIGURE_FILE( @@ -111,6 +100,4 @@ IF(ENABLE_DOXYGEN) #make the doxygen generation a built-time dependency ADD_CUSTOM_TARGET(doxygen_docs ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR_DOXYGEN}) INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR_DOXYGEN} DESTINATION ${PKG_DOC_DIR}) -ELSE(ENABLE_DOXYGEN) - MESSAGE(STATUS " Disabled generation of Doxygen documentation.") ENDIF(ENABLE_DOXYGEN) |