diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2022-04-20 17:29:31 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2022-04-20 17:29:31 +0200 |
| commit | 3ad842bcd9f9e7c0014e05f4b75ce4ae49a06e29 (patch) | |
| tree | 0520ea97bb12ea22b6adcd183d6f414d2b073737 | |
| parent | a096d85a9d6e4b004711131265a43a320e80442e (diff) | |
| parent | b6a46aa0199c2595766495673f67a8190f3342fe (diff) | |
| download | qbs-3ad842bcd9f9e7c0014e05f4b75ce4ae49a06e29.tar.gz | |
Merge 1.22 into master
Change-Id: I36fc5c61dafe4f5fc87db53d863cc97743440deb
| -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: |