From 96e9d5cd76ff1176c5e214839f2a97ed9d4aed19 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 1 Sep 2023 18:34:12 +0200 Subject: [PATCH] CMake: Remove qt_internal_qt_configure_end workaround Now that the top-level build calls qt_internal_qt_configure_end itself, we don't need to call it in qt_print_build_instructions. Change-Id: I906ee7bc1aed3b597049b5996a41dd298175343c Reviewed-by: Alexey Edelev (cherry picked from commit 28516ed1fdf52665886f6005766257776453e584) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtBaseTopLevelHelpers.cmake | 4 ---- cmake/QtBuildInformation.cmake | 7 ------- 2 files changed, 11 deletions(-) diff --git a/cmake/QtBaseTopLevelHelpers.cmake b/cmake/QtBaseTopLevelHelpers.cmake index 27f0852b338..8de37a485a1 100644 --- a/cmake/QtBaseTopLevelHelpers.cmake +++ b/cmake/QtBaseTopLevelHelpers.cmake @@ -18,10 +18,6 @@ macro(qt_internal_top_level_setup_autodetect) endmacro() macro(qt_internal_top_level_setup_after_project) - # TODO: Remove this variable once the top-level calls this function and - # qt_internal_qt_configure_end is not called in qt_print_build_instructions anymore. - set(__qt6_top_level_after_project_called TRUE) - qt_internal_top_level_setup_testing() endmacro() diff --git a/cmake/QtBuildInformation.cmake b/cmake/QtBuildInformation.cmake index 063c5866e75..6929f9134ef 100644 --- a/cmake/QtBuildInformation.cmake +++ b/cmake/QtBuildInformation.cmake @@ -111,13 +111,6 @@ from the build directory") if(QT_SUPERBUILD) qt_internal_save_previously_visited_packages() endif() - - # TODO: Abuse qt_print_build_instructions being called as the last command in a top-level build. - # Instead we should call this explicitly at the end of the top-level project. - # TODO: Remove this once the top-level calls qt_internal_top_level_setup_after_project - if(QT_SUPERBUILD AND NOT __qt6_top_level_after_project_called) - qt_internal_qt_configure_end() - endif() endfunction() function(qt_configure_print_summary_helper summary_reports force_show)