diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2022-08-18 18:34:47 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2022-08-19 23:53:11 +0200 |
| commit | a2809d9ec1c4351bc356e05e8f3c1db0363bef86 (patch) | |
| tree | 3c67dcc77ed9f0ed3abbd9996b85d3509db2ca68 /src | |
| parent | 50f8a9578dd54f74e8a5f99481f7f34d969d867f (diff) | |
| download | qtbase-a2809d9ec1c4351bc356e05e8f3c1db0363bef86.tar.gz | |
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
Pick-to: 6.3 6.4
Change-Id: I0c98eee6594c395dc6a37465a99ea32b1af39b84
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
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 2cc5d3e8e6..99ecbd3914 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -974,11 +974,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 "") |