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

Trigger reconfiguring of android ABI projects when CMake files changed

Browse Source 
Remove the stamp files of 'configure' step to ensure that we re-run
cmake for android ABI projects, otherwise the per-ABI projects do not
consider the changes in CMake files when re-running the build.

Task-number: QTBUG-129358
Change-Id: I5b5c682358052044a9e550587ed0457694857e09
Reviewed-by: Soheil Armin <soheil.armin@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 87930bb568018cc40ccd30babb42c8701e1d030c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2024-09-26 13:35:04 +02:00 committed by Qt Cherry-pick Bot
parent 52c908fdb5
commit 839695567f
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/Qt6AndroidMacros.cmake
View File

@ -1302,6 +1302,9 @@ function(_qt_internal_add_android_abi_step project abi step)
endif() endif()
_qt_internal_get_android_abi_step_stampfile(stamp ${project} ${abi} ${step}) _qt_internal_get_android_abi_step_stampfile(stamp ${project} ${abi} ${step})
if(step STREQUAL "configure" AND EXISTS "${stamp}")
file(REMOVE "${stamp}")
endif()
add_custom_command(OUTPUT "${stamp}" add_custom_command(OUTPUT "${stamp}"
COMMAND ${arg_COMMAND} COMMAND ${arg_COMMAND}
COMMAND "${CMAKE_COMMAND}" -E touch "${stamp}" COMMAND "${CMAKE_COMMAND}" -E touch "${stamp}"