diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-01-08 12:44:54 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-01-08 19:24:01 +0000 |
| commit | 7072295159b8c6128c3957bbafe5cb7b944129be (patch) | |
| tree | 7f3144a54aa25df74265a2c4a484fa6f1c68dc0e /cmake | |
| parent | c3b963ae4d430c70ad5ae745f403f10a5adfbdac (diff) | |
Remove redundant .qch from installed docs
Use upper-level document build directory for generated .qch files. This
avoids copying of .qch with html documents and duplicating them in
the installation directory.
Change-Id: I63b2de0047005419d352ea259dec6f17a826a477
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 4d34314679598078d11508f540fe75f51a879046)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtDocsHelpers.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake index 78acb3a53d..593a72c90e 100644 --- a/cmake/QtDocsHelpers.cmake +++ b/cmake/QtDocsHelpers.cmake @@ -75,9 +75,11 @@ function(qt_internal_add_docs) get_filename_component(doc_target "${doc_project}" NAME_WLE) if (QT_WILL_INSTALL) set(qdoc_output_dir "${CMAKE_BINARY_DIR}/${INSTALL_DOCDIR}/${doc_target}") + set(qdoc_qch_output_dir "${CMAKE_BINARY_DIR}/${INSTALL_DOCDIR}") set(index_dir "${CMAKE_BINARY_DIR}/${INSTALL_DOCDIR}") else() set(qdoc_output_dir "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_DOCDIR}/${doc_target}") + set(qdoc_qch_output_dir "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_DOCDIR}") set(index_dir "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_DOCDIR}") endif() @@ -153,7 +155,7 @@ function(qt_internal_add_docs) # generate .qch set(qch_file_name ${doc_target}.qch) - set(qch_file_path ${qdoc_output_dir}/${qch_file_name}) + set(qch_file_path ${qdoc_qch_output_dir}/${qch_file_name}) foreach(target_prefix qch_top_level_docs qch_repo_docs qch_docs) add_custom_target(${target_prefix}_${target} |