From db939d8f331b8a15b9205a450a42296f7aa0c3a4 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Thu, 5 Nov 2020 10:32:30 +0100
Subject: CMake: Fix top-level documentation install targets

The following targets did not do any actual installation:
install_docs, install_html_docs, install_qch_docs,
plus their repository-level counterparts.

Add the following dependencies:

install_html_docs
    --> install_html_docs_<repo>
        --> install_html_docs_<module>

Analogous for qch.

The install_docs target already triggers install_html_docs and
install_qch_docs. Analogous for install_docs_<repo>.

Fixes: QTBUG-86738
Change-Id: I3468e000e050e2787a859e61d40161f5459cb351
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 4 ++++
 cmake/QtDocsHelpers.cmake                           | 2 ++
 2 files changed, 6 insertions(+)

(limited to 'cmake')

diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
index 5bf4f4a567..a10e27886a 100644
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
@@ -284,6 +284,10 @@ macro(qt_build_repo_begin)
     # Make top-level prepare_docs target depend on the repository-level prepare_docs_<repo> target.
     add_dependencies(prepare_docs ${qt_docs_prepare_target_name})
 
+    # Make top-level install_*_docs targets depend on the repository-level install_*_docs targets.
+    add_dependencies(install_html_docs ${qt_docs_install_html_target_name})
+    add_dependencies(install_qch_docs ${qt_docs_install_qch_target_name})
+
     # Add host_tools meta target, so that developrs can easily build only tools and their
     # dependencies when working in qtbase.
     if(NOT TARGET host_tools)
diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake
index 77ec8c3f01..232d7f6107 100644
--- a/cmake/QtDocsHelpers.cmake
+++ b/cmake/QtDocsHelpers.cmake
@@ -194,6 +194,8 @@ function(qt_internal_add_docs)
     add_dependencies(${qt_docs_prepare_target_name} prepare_docs_${target})
     add_dependencies(${qt_docs_generate_target_name} generate_repo_docs_${target})
     add_dependencies(${qt_docs_qch_target_name} qch_repo_docs_${target})
+    add_dependencies(${qt_docs_install_html_target_name} install_html_docs_${target})
+    add_dependencies(${qt_docs_install_qch_target_name} install_qch_docs_${target})
 
     # Make sure that the necessary tools are built when running,
     # for example 'cmake --build . --target generate_docs'.
-- 
cgit v1.2.3