Cold-Air-Networks/mirror-llvm-project
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 7

[docs] try again to handle doxygen everywhere (#203081)

Browse source 
The previous attempt at this (b7da956501)
still broke standalone builds. Now I have locally tested standalone
flang, runtimes (with openmp), lldb, combined builds, and the utils
script. Hopefully that covers everything this time, and gets everything
into a more consistent state (always using the HandleDoxygen script in
the same way, included exactly once as required by the cmake design).
This commit is contained in:
Jameson Nash 2026-06-11 08:58:36 -04:00 committed by GitHub
parent c8ad049db7
commit 7daddf2b6f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 13 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bolt/docs/CMakeLists.txt
View file

@ -1,5 +1,3 @@
find_package(Doxygen)
if (DOXYGEN_FOUND)
if (LLVM_ENABLE_DOXYGEN)
set(abs_top_srcdir ${CMAKE_CURRENT_SOURCE_DIR})
@ -48,7 +46,6 @@ if (LLVM_ENABLE_DOXYGEN)
set(bolt_doxygen_qhp_cust_filter_attrs "")
endif()
include(HandleDoxygen)
llvm_configure_doxygen()
set(abs_top_srcdir)

1
clang-tools-extra/docs/CMakeLists.txt
View file

@ -46,7 +46,6 @@ if (DOXYGEN_FOUND)
set(clang_tools_doxygen_qhp_cust_filter_attrs "")
endif()
include(HandleDoxygen)
llvm_configure_doxygen()
set(abs_top_srcdir)

2
clang/docs/CMakeLists.txt
View file

@ -1,4 +1,3 @@
if (DOXYGEN_FOUND)
if (LLVM_ENABLE_DOXYGEN)
set(abs_srcdir ${CMAKE_CURRENT_SOURCE_DIR})
@ -47,7 +46,6 @@ if (LLVM_ENABLE_DOXYGEN)
set(clang_doxygen_qhp_cust_filter_attrs "")
endif()
include(HandleDoxygen)
llvm_configure_doxygen()
set(abs_top_srcdir)

5
cmake/Modules/HandleDoxygen.cmake
View file

@ -20,6 +20,11 @@ if (LLVM_ENABLE_DOXYGEN)
llvm_find_program(dot)
find_package(Doxygen REQUIRED)
message(STATUS "Doxygen enabled (${DOXYGEN_VERSION}).")
# 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()
if (DOXYGEN_FOUND)
option(LLVM_DOXYGEN_EXTERNAL_SEARCH "Enable doxygen external search." OFF)

7
flang/CMakeLists.txt
View file

@ -241,9 +241,6 @@ if (FLANG_STANDALONE_BUILD)
else()
add_custom_target(check-all DEPENDS check-flang )
endif()
if (LLVM_BUILD_DOCS)
add_custom_target(doxygen-flang ALL)
endif()
else()
option(FLANG_INCLUDE_TESTS
@ -305,6 +302,7 @@ list(INSERT CMAKE_MODULE_PATH 0
"${FLANG_SOURCE_DIR}/cmake/modules"
"${LLVM_COMMON_CMAKE_UTILS}/Modules"
)
include(AddFlang)
if (NOT DEFAULT_SYSROOT)
@ -516,6 +514,9 @@ endif()
option(FLANG_INCLUDE_DOCS "Generate build targets for the Flang docs."
${LLVM_INCLUDE_DOCS})
if(FLANG_STANDALONE_BUILD)
include(HandleDoxygen)
endif()
if (FLANG_INCLUDE_DOCS)
add_subdirectory(docs)
endif()

3
flang/docs/CMakeLists.txt
View file

@ -1,5 +1,3 @@
find_package(Doxygen)
if (DOXYGEN_FOUND)
if (LLVM_ENABLE_DOXYGEN)
set(abs_top_srcdir ${CMAKE_CURRENT_SOURCE_DIR})
@ -48,7 +46,6 @@ if (LLVM_ENABLE_DOXYGEN)
set(flang_doxygen_qhp_cust_filter_attrs "")
endif()
include(HandleDoxygen)
llvm_configure_doxygen()
set(abs_top_srcdir)

1
lldb/CMakeLists.txt
View file

@ -34,6 +34,7 @@ if(LLDB_BUILT_STANDALONE)
set(CMAKE_CXX_EXTENSIONS NO)
include(LLDBStandalone)
include(HandleDoxygen)
endif()
include(LLDBConfig)

3
lldb/docs/CMakeLists.txt
View file

@ -1,11 +1,8 @@
include(FindDoxygen)
if(DOXYGEN_FOUND)
set(abs_top_srcdir ${CMAKE_CURRENT_SOURCE_DIR}/..)
set(DOT dot)
set(PACKAGE_VERSION mainline)
set(abs_top_builddir ..)
include(HandleDoxygen)
llvm_configure_doxygen()
add_custom_target(lldb-cpp-doc

11
llvm/CMakeLists.txt
View file

@ -927,17 +927,6 @@ option (LLVM_ENABLE_BINDINGS "Build bindings." ON)
option (LLVM_ENABLE_TELEMETRY "Enable the telemetry library. If set to OFF, library cannot be enabled after build (eg., at runtime)" ON)
include(HandleDoxygen)
if (LLVM_ENABLE_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()
endif()
set(LLVM_INSTALL_DOXYGEN_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/llvm/doxygen-html"
CACHE STRING "Doxygen-generated HTML documentation install directory")

1
llvm/docs/CMakeLists.txt
View file

@ -56,7 +56,6 @@ if (LLVM_ENABLE_DOXYGEN)
set(llvm_doxygen_qhp_cust_filter_attrs "")
endif()
include(HandleDoxygen)
llvm_configure_doxygen()
set(abs_top_srcdir)

2
mlir/docs/CMakeLists.txt
View file

@ -1,4 +1,3 @@
if (DOXYGEN_FOUND)
if (LLVM_ENABLE_DOXYGEN)
set(abs_top_srcdir ${CMAKE_CURRENT_SOURCE_DIR})
@ -47,7 +46,6 @@ if (LLVM_ENABLE_DOXYGEN)
set(mlir_doxygen_qhp_cust_filter_attrs "")
endif()
include(HandleDoxygen)
llvm_configure_doxygen()
set(abs_top_srcdir)

2
openmp/docs/CMakeLists.txt
View file

@ -1,4 +1,3 @@
if (DOXYGEN_FOUND)
if (LLVM_ENABLE_DOXYGEN)
set(abs_srcdir ${CMAKE_CURRENT_SOURCE_DIR})
@ -47,7 +46,6 @@ if (LLVM_ENABLE_DOXYGEN)
set(openmp_doxygen_qhp_cust_filter_attrs "")
endif()
include(HandleDoxygen)
llvm_configure_doxygen()
set(abs_top_srcdir)

1
polly/docs/CMakeLists.txt
View file

@ -46,7 +46,6 @@ if (LLVM_ENABLE_DOXYGEN)
set(polly_doxygen_qhp_cust_filter_attrs "")
endif()
include(HandleDoxygen)
llvm_configure_doxygen()
set(abs_top_srcdir)

4
runtimes/CMakeLists.txt
View file

@ -296,7 +296,9 @@ option(LLVM_INCLUDE_DOCS "Generate build targets for the runtimes documentation.
option(LLVM_ENABLE_SPHINX "Use Sphinx to generate the runtimes documentation." OFF)
option(RUNTIMES_EXECUTE_ONLY_CODE "Compile runtime libraries as execute-only." OFF)
include(HandleDoxygen)
if(NOT HAVE_LLVM_LIT)
include(HandleDoxygen)
endif()
if (RUNTIMES_EXECUTE_ONLY_CODE)
# If a target doesn't support or recognise -mexecute-only, Clang will simply ignore the flag.