From 4c257fd3533dff5252a759b5f02f3a07ff0156bd Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 24 Aug 2023 11:32:53 +0200 Subject: [PATCH] CMake: Fix early exit in qt_build_repo_post_process() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a macro. We cannot use return() here or we're skipping code at the call site. This commit amends b6849849392cf14ead014833976d1926504985d2. Task-number: QTBUG-88264 Change-Id: Icf6dd06338584239873bf4d66a4bbceef9071399 Reviewed-by: Alexey Edelev Reviewed-by: Amir Masoud Abdol Reviewed-by: Jøger Hansegård (cherry picked from commit b1aa6c2bc89a597300776ef6d372a55de5c43f5a) (cherry picked from commit d5b3e174e3240fbdc0385fdc8408c547b3121eb2) --- cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index 3de8ffbfd22..93c1fa0fd82 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -550,13 +550,12 @@ endmacro() # Runs delayed actions on some of the Qt targets. # Can be called either explicitly or as part of qt_build_repo_end(). macro(qt_build_repo_post_process) - if(QT_INTERNAL_REPO_POST_PROCESS_CALLED) - return() + if(NOT QT_INTERNAL_REPO_POST_PROCESS_CALLED) + set(QT_INTERNAL_REPO_POST_PROCESS_CALLED TRUE) + if(NOT QT_BUILD_STANDALONE_TESTS) + include(QtPostProcess) + endif() endif() - if(NOT QT_BUILD_STANDALONE_TESTS) - include(QtPostProcess) - endif() - set(QT_INTERNAL_REPO_POST_PROCESS_CALLED TRUE) endmacro() macro(qt_build_repo_end)