diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2022-08-18 18:34:47 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-20 00:51:20 +0000 |
| commit | 3eb367095f98a62993dff6230ba2abe72e3706c6 (patch) | |
| tree | df9d7070342a7db9a870189d57867bc4f2d2171a /src | |
| parent | 70783deaa162348c01c23a8d201f52dee10339d5 (diff) | |
Fix Multi-ABI builds when CMAKE_<C/CXX>_COMPILER_LAUNCHER contains list
Add list-escaping for CMAKE_<C/CXX>_COMPILER_LAUNCHER variables when
passing them to an external ABI-specific Android project.
Amends c7231177df71879b6d3ebc48288a6d3d8fdab6d0
Change-Id: I0c98eee6594c395dc6a37465a99ea32b1af39b84
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit a2809d9ec1c4351bc356e05e8f3c1db0363bef86)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/Qt6AndroidMacros.cmake | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index 4b71022960..b05afb056a 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -971,11 +971,17 @@ function(_qt_internal_configure_android_multiabi_target target) endif() if(CMAKE_C_COMPILER_LAUNCHER) - list(APPEND extra_cmake_args "-DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}") + list(JOIN CMAKE_C_COMPILER_LAUNCHER "$<SEMICOLON>" + compiler_launcher) + list(APPEND extra_cmake_args + "-DCMAKE_C_COMPILER_LAUNCHER=${compiler_launcher}") endif() if(CMAKE_CXX_COMPILER_LAUNCHER) - list(APPEND extra_cmake_args "-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}") + list(JOIN CMAKE_CXX_COMPILER_LAUNCHER "$<SEMICOLON>" + compiler_launcher) + list(APPEND extra_cmake_args + "-DCMAKE_CXX_COMPILER_LAUNCHER=${compiler_launcher}") endif() set(missing_qt_abi_toolchains "") |