From 2746051522153d8d6c7306bd4338fa24d8a4e06b Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 5 Nov 2020 09:48:55 +0100 Subject: [PATCH] CMake: Disconnect docs installation targets from generation targets "ninja install_docs" should not run the "docs" target, because with the usual workflow ninja docs ninja install_docs the documentation would be built twice. That of course means that "ninja install_docs" will fail if "ninja docs" wasn't run before. Analogous for html_docs, qch_docs, the repository-level and module-level documentation targets. Change-Id: I8ad83602dd393b5afc79a19ab3d395987c889d0d Reviewed-by: Alexandru Croitor --- cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 4 ---- cmake/QtDocsHelpers.cmake | 3 --- 2 files changed, 7 deletions(-) diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index a10e27886a..5e49a99f5d 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -239,8 +239,6 @@ macro(qt_build_repo_begin) add_custom_target(install_docs) add_dependencies(html_docs generate_docs) add_dependencies(docs html_docs qch_docs) - add_dependencies(install_html_docs html_docs) - add_dependencies(install_qch_docs qch_docs) add_dependencies(install_docs install_html_docs install_qch_docs) endif() @@ -277,8 +275,6 @@ macro(qt_build_repo_begin) add_dependencies(${qt_docs_generate_target_name} ${qt_docs_prepare_target_name}) add_dependencies(${qt_docs_html_target_name} ${qt_docs_generate_target_name}) add_dependencies(${qt_docs_target_name} ${qt_docs_html_target_name} ${qt_docs_qch_target_name}) - add_dependencies(${qt_docs_install_html_target_name} ${qt_docs_html_target_name}) - add_dependencies(${qt_docs_install_qch_target_name} ${qt_docs_qch_target_name}) add_dependencies(${qt_docs_install_target_name} ${qt_docs_install_html_target_name} ${qt_docs_install_qch_target_name}) # Make top-level prepare_docs target depend on the repository-level prepare_docs_ target. diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake index 232d7f6107..a30ed66a32 100644 --- a/cmake/QtDocsHelpers.cmake +++ b/cmake/QtDocsHelpers.cmake @@ -181,9 +181,6 @@ function(qt_internal_add_docs) add_custom_target(install_qch_docs_${target}) endif() - add_dependencies(install_html_docs_${target} html_docs_${target}) - add_dependencies(install_qch_docs_${target} qch_docs_${target}) - add_custom_target(install_docs_${target}) add_dependencies(install_docs_${target} install_html_docs_${target} install_qch_docs_${target})