diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2022-04-02 20:20:35 +0300 |
|---|---|---|
| committer | Dmitry Shachnev <mitya57@gmail.com> | 2022-04-20 09:47:47 +0000 |
| commit | b6a46aa0199c2595766495673f67a8190f3342fe (patch) | |
| tree | eb90765061cd73eca67a60fab9635f8b1ffb9bc9 | |
| parent | 0ccbc9f30d3fc6994d6ec3a7db0ed60e2c9dc500 (diff) | |
Fix install of QCH and HTML documentationv1.22.1
- 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.
Change-Id: I11fa33e5d2f9e0a39184a7d82ac1a8faf064f25e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | cmake/QbsBuildConfig.cmake | 2 | ||||
| -rw-r--r-- | cmake/QbsDocumentation.cmake | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cmake/QbsBuildConfig.cmake b/cmake/QbsBuildConfig.cmake index 28827268d..166afe6d5 100644 --- a/cmake/QbsBuildConfig.cmake +++ b/cmake/QbsBuildConfig.cmake @@ -23,7 +23,7 @@ set(QBS_LIBEXEC_INSTALL_DIR "${_DEFAULT_LIBEXEC_INSTALL_DIR}" CACHE STRING "Rela set(QBS_PLUGINS_INSTALL_BASE "${QBS_LIBDIR_NAME}" CACHE STRING "Relative install location for Qbs plugins.") set(QBS_RESOURCES_INSTALL_BASE "." CACHE STRING "Relative install location for Qbs resources.") set(QBS_HEADERS_INSTALL_DIR "include/qbs" CACHE STRING "Relative install location for Qbs headers.") -set(QBS_DOC_INSTALL_DIR "${QBS_RESOURCES_INSTALL_BASE}/share/doc/qbs/html" CACHE STRING "Relative install location for Qbs documentation.") +set(QBS_DOC_INSTALL_DIR "${QBS_RESOURCES_INSTALL_BASE}/share/doc/qbs" CACHE STRING "Relative install location for Qbs documentation.") set(QBS_PLUGINS_INSTALL_DIR "${QBS_PLUGINS_INSTALL_BASE}/qbs/plugins") set(QBS_RESOURCES_INSTALL_DIR "${QBS_RESOURCES_INSTALL_BASE}/share") diff --git a/cmake/QbsDocumentation.cmake b/cmake/QbsDocumentation.cmake index d9bdb7a09..a1ce44057 100644 --- a/cmake/QbsDocumentation.cmake +++ b/cmake/QbsDocumentation.cmake @@ -229,6 +229,8 @@ function(_qbs_setup_qhelpgenerator_targets _qdocconf_file _html_outputdir) install(FILES "${_qch_outputdir}/${_target}.qch" DESTINATION "${_arg_INSTALL_DIR}" COMPONENT qbs_qch_docs) + install(DIRECTORY "${_qch_outputdir}/html" DESTINATION "${_arg_INSTALL_DIR}" + COMPONENT qbs_html_docs) endfunction() # Helper functions: |