diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-11-18 13:19:00 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-12-01 07:28:58 +0100 |
| commit | a88b53f713a564be833d8b744beb5889be1d8ecc (patch) | |
| tree | dfd45c21cca6d00e5e0bfd6f079fc921f899463e /src/corelib/Qt6CoreMacros.cmake | |
| parent | 4ad57bb212ee1480acd847c48fe5567627952da4 (diff) | |
Use config from the main ABI when building ABI-specific external project
ABI-specific external projects should use the same config as the one is
used by the "main" ABI.
Task-number: QTBUG-88841
Change-Id: If7a1834d9a3f238f6dadd05323ccc0cf8552128c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/corelib/Qt6CoreMacros.cmake')
| -rw-r--r-- | src/corelib/Qt6CoreMacros.cmake | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 13026a1520..b3687d7bfa 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -590,6 +590,13 @@ function(_qt_internal_create_executable target) continue() endif() + get_cmake_property(is_multi_config GENERATOR_IS_MULTI_CONFIG) + if(is_multi_config) + list(JOIN CMAKE_CONFIGURATION_TYPES "$<SEMICOLON>" escaped_configuration_types) + set(config_arg "-DCMAKE_CONFIGURATION_TYPES=${escaped_configuration_types}") + else() + set(config_arg "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}") + endif() _qt_internal_get_android_abi_path(qt_abi_path ${abi}) set(qt_abi_toolchain_path "${qt_abi_path}/lib/cmake/${QT_CMAKE_EXPORT_NAMESPACE}/qt.toolchain.cmake") @@ -600,10 +607,12 @@ function(_qt_internal_create_executable target) CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${qt_abi_toolchain_path}" "-DQT_IS_ANDROID_MULTI_ABI_EXTERNAL_PROJECT=ON" "-DQT_ANDROID_ABI_TARGET_PATH=${abi_copy_target_path}" + "${config_arg}" STEP_TARGETS build EXCLUDE_FROM_ALL TRUE BUILD_COMMAND "${CMAKE_COMMAND}" "--build" "${CMAKE_CURRENT_BINARY_DIR}/${target}_${abi}" + "--config" "$<CONFIG>" "--target" "${target}_prepare_apk_dir" ) add_dependencies(${target} "${target}_${abi}-build") |