diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2020-10-21 11:20:04 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2020-10-24 17:44:34 +0000 |
| commit | c4245e7b8ceb233a06cea1ace9439795738adbf8 (patch) | |
| tree | 25dff26db79c995f7f56fdbe8a4662cb5c9a9bbc /cmake | |
| parent | d2cf18bf03a8f1425994e33e81cdc2c04ff7ac68 (diff) | |
CMake: Don't invoke QDoc excessively
The html_docs target does not need to call QDoc a third time as
both its dependencies already do that.
With qmake, html_docs did invoke QDoc if CONFIG did not include
'prepare_docs', but none of the Qt modules used that configuration.
We can manage without it for now.
Fixes: QTBUG-87751
Change-Id: I45d2d06006c566c431ae41d7f3a06d6b809987f2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtDocsHelpers.cmake | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake index 0b455d5ed5..7a635eea03 100644 --- a/cmake/QtDocsHelpers.cmake +++ b/cmake/QtDocsHelpers.cmake @@ -140,22 +140,8 @@ function(qt_internal_add_docs) add_dependencies(generate_docs_${target} prepare_docs_${target}) - # generate html - set(html_qdocs_args - -outputdir "${qdoc_output_dir}" - -installdir "${INSTALL_DOCDIR}" - "${target_source_dir}/${doc_project}" - -indexdir "${index_dir}" - "${include_path_args}" - ) - - add_custom_target(html_docs_${target} - DEPENDS ${qdoc_bin} - COMMAND ${CMAKE_COMMAND} -E env ${qdoc_env_args} - ${qdoc_bin} - ${html_qdocs_args} - ) - + # html docs target + add_custom_target(html_docs_${target}) add_dependencies(html_docs_${target} generate_docs_${target}) # generate .qch |