From 9e65223f0f881e4bfa0600a8fd2ea6fa49a98011 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Thu, 7 Apr 2022 19:59:47 +0100 Subject: [PATCH] fix install of QCH and HTML documentation Forwarded: https://codereview.qt-project.org/c/qbs/qbs/+/404053 Last-Update: 2022-04-02 - qbs.qch should go to QT_INSTALL_DOCS, not to QBS_DOC_INSTALL_DIR (which ends with /html by default). - HTML documentation was not installed at all. Gbp-Pq: Name docs_install_path.diff --- cmake/QbsDocumentation.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/QbsDocumentation.cmake b/cmake/QbsDocumentation.cmake index d9bdb7a0..7e881e3f 100644 --- a/cmake/QbsDocumentation.cmake +++ b/cmake/QbsDocumentation.cmake @@ -227,8 +227,10 @@ function(_qbs_setup_qhelpgenerator_targets _qdocconf_file _html_outputdir) add_custom_target("${_qch_target}" DEPENDS "${_qch_artifact}") add_dependencies(qbs_qch_docs "${_qch_target}") - install(FILES "${_qch_outputdir}/${_target}.qch" DESTINATION "${_arg_INSTALL_DIR}" + install(FILES "${_qch_outputdir}/${_target}.qch" DESTINATION "${QT_INSTALL_DOCS}" COMPONENT qbs_qch_docs) + install(DIRECTORY "${_qch_outputdir}/html/" DESTINATION "${_arg_INSTALL_DIR}" + COMPONENT qbs_html_docs) endfunction() # Helper functions: -- 2.30.2