CMake: Fix early exit in qt_build_repo_post_process()
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>
This commit is contained in:
parent
64510186f7
commit
b1aa6c2bc8
@ -547,13 +547,12 @@ endmacro()
|
|||||||
# Runs delayed actions on some of the Qt targets.
|
# Runs delayed actions on some of the Qt targets.
|
||||||
# Can be called either explicitly or as part of qt_build_repo_end().
|
# Can be called either explicitly or as part of qt_build_repo_end().
|
||||||
macro(qt_build_repo_post_process)
|
macro(qt_build_repo_post_process)
|
||||||
if(QT_INTERNAL_REPO_POST_PROCESS_CALLED)
|
if(NOT QT_INTERNAL_REPO_POST_PROCESS_CALLED)
|
||||||
return()
|
set(QT_INTERNAL_REPO_POST_PROCESS_CALLED TRUE)
|
||||||
|
if(NOT QT_BUILD_STANDALONE_TESTS)
|
||||||
|
include(QtPostProcess)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
if(NOT QT_BUILD_STANDALONE_TESTS)
|
|
||||||
include(QtPostProcess)
|
|
||||||
endif()
|
|
||||||
set(QT_INTERNAL_REPO_POST_PROCESS_CALLED TRUE)
|
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
macro(qt_build_repo_end)
|
macro(qt_build_repo_end)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user