diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-10-27 10:33:51 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-11-26 23:24:22 +0000 |
| commit | ff7850ec3096a0090d4bd4bfe25e2cf7f0bccd05 (patch) | |
| tree | 2dbd57f37dfdf730f06aacdacfdd277a207ab807 /sources/pyside6/CMakeLists.txt | |
| parent | af1cea3b25baba6e72d9fe7557893a7ce6411592 (diff) | |
CMake: Cleanup documentation building code
Move conditions on whether documentation should be built inside the
doc project, rather than outside.
Look for qdoc and qhelpgenerator both in PATH and via
find_package(Qt6Tools) calls.
Add sanity checks that the various tools used in the
add_custom_command calls are actually available.
Show a warning or error when they are not available,
depending on combination of whether it's a standalone doc
build or part of the overall shiboken/python build.
Set DOC_OUTPUT_FORMAT to html by default if it's not specified.
Clean up some of the warning messages.
Make sure to check the result of running execute_process on the
snippets tool.
Task-number: PYSIDE-1718
Change-Id: I2969d7a40961881ad0f91d7142b29a7f4130f3b7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 39f47bc8f61e8986a729a153cba619761bacc280)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'sources/pyside6/CMakeLists.txt')
| -rw-r--r-- | sources/pyside6/CMakeLists.txt | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/sources/pyside6/CMakeLists.txt b/sources/pyside6/CMakeLists.txt index 233880997..c24de1b76 100644 --- a/sources/pyside6/CMakeLists.txt +++ b/sources/pyside6/CMakeLists.txt @@ -20,17 +20,4 @@ if(BUILD_TESTS) add_subdirectory(tests) endif() -if(QT_SRC_DIR AND SPHINX_BUILD AND DOT_EXEC AND NOT SKIP_DOCS) - add_subdirectory(doc) -else() - set(DOCS_TARGET_DISABLED_MESSAGE "apidoc generation targets disabled.") - if(NOT QT_SRC_DIR) - message(STATUS "QT_SRC_DIR variable not set, ${DOCS_TARGET_DISABLED_MESSAGE}") - elseif(NOT SPHINX_BUILD) - message(STATUS "sphinx-build command not found, ${DOCS_TARGET_DISABLED_MESSAGE}") - elseif(NOT DOT_EXEC) - message(STATUS "graphviz not found, ${DOCS_TARGET_DISABLED_MESSAGE}") - else() - message(STATUS "Unknown issue occurred, ${DOCS_TARGET_DISABLED_MESSAGE}") - endif() -endif() +add_subdirectory(doc) |