1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Fix early exit in qt_build_repo_post_process()

Browse Source 
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 <alexey.edelev@qt.io>
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
(cherry picked from commit b1aa6c2bc89a597300776ef6d372a55de5c43f5a)
(cherry picked from commit d5b3e174e3240fbdc0385fdc8408c547b3121eb2)
This commit is contained in:
Joerg Bornemann 2023-08-24 11:32:53 +02:00 committed by Alexandru Croitor
parent 16a9587a2c
commit 4c257fd353
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
View File

@ -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)