diff options
| -rwxr-xr-x | cmake/config-ix.cmake | 9 | ||||
| -rw-r--r-- | docs/CMakeLists.txt | 12 |
2 files changed, 15 insertions, 6 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index 3bf7583..3f57e23 100755 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -465,6 +465,15 @@ set(LLVM_PREFIX ${CMAKE_INSTALL_PREFIX}) if (LLVM_ENABLE_DOXYGEN) message(STATUS "Doxygen enabled.") find_package(Doxygen) + + if (DOXYGEN_FOUND) + # If we find doxygen and we want to enable doxygen by default create a + # global aggregate doxygen target for generating llvm and any/all + # subprojects doxygen documentation. + if (LLVM_BUILD_DOCS) + add_custom_target(doxygen ALL) + endif() + endif() else() message(STATUS "Doxygen disabled.") endif() diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 505b5db..7f1a51f 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -1,8 +1,4 @@ -if (LLVM_BUILD_DOCS) - set(LLVM_DOCS_ADD_TO_ALL ALL) -endif() - if (DOXYGEN_FOUND) if (LLVM_ENABLE_DOXYGEN) set(abs_top_srcdir ${LLVM_MAIN_SRC_DIR}) @@ -18,10 +14,14 @@ if (LLVM_ENABLE_DOXYGEN) set(abs_top_builddir) set(DOT) - add_custom_target(doxygen ${LLVM_DOCS_ADD_TO_ALL} + add_custom_target(doxygen-llvm COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "Generating doxygen documentation." VERBATIM) + COMMENT "Generating llvm doxygen documentation." VERBATIM) + + if (LLVM_BUILD_DOCS) + add_dependencies(doxygen doxygen-llvm) + endif() if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doxygen/html |