diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-12-29 16:30:47 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-04 19:02:30 +0000 |
| commit | e9755b256519a219697a5a83b49498fd44054053 (patch) | |
| tree | bc15da53ea8ec1736f2aee53fecadcd42126f3bd | |
| parent | b7e2b71a8e26c73b9cc8ae86fec0174a029dd2ec (diff) | |
Fix build of multiple apks in a single project tree
ExternalProject_Add_Step adds the step timestamp file as the
dependency to a '-complete' file generated by add_custom_command
that is run inside the ExternalProject_Add function. Since the
'-complete' file path is computed using CMAKE_CURRENT_BINARY_DIR
we run into the issue if ExternalProject_Add and
ExternalProject_Add_Step are run from the different source
directories and have the different default binary directories as
well. This change suppresses the behavior by adding the
'EXCLUDE_FROM_MAIN TRUE' flag. We may do this since the target
related to the step is added to the dependency chain of executable
target and the chain of external project is not used for now.
Change-Id: I7203261b61cfa56bcd9e49ac3e8d7ecb217a5a6c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit d62463305d6a0471e5f234ce04303cb302725a7a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/corelib/Qt6AndroidMacros.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index d61f0e070d..f5141a3d33 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -861,7 +861,6 @@ function(_qt_internal_configure_android_multiabi_target target) "-DQT_INTERNAL_ANDROID_MULTI_ABI_BINARY_DIR=${CMAKE_BINARY_DIR}" "${config_arg}" EXCLUDE_FROM_ALL TRUE - STETPS_TARGETS BUILD_COMMAND "" # avoid top-level build of external project ) set_property(GLOBAL APPEND PROPERTY @@ -873,6 +872,7 @@ function(_qt_internal_configure_android_multiabi_target target) # TODO: Remove this when the step will depend on DEPFILE generated by # androiddeployqt for the ${target}. ALWAYS TRUE + EXCLUDE_FROM_MAIN TRUE COMMAND "${CMAKE_COMMAND}" "--build" "${android_abi_build_dir}" "--config" "$<CONFIG>" |