diff options
| author | Alexey Edelev <[email protected]> | 2024-03-19 16:05:32 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <[email protected]> | 2024-03-22 17:08:12 +0000 |
| commit | 18d90920e4d35756b271a45cde3da8b6844e14f9 (patch) | |
| tree | 61a1800e6a0c95cf33643779fd1fdfc5fd365704 | |
| parent | 490bbd672bf571e79d1f3452cf8f517ebd5900f7 (diff) | |
Use the correctly versioned variable when resolving ABI-specific cmake directory
Use the QT_CMAKE_EXPORT_NAMESPACE prefixed INSTALL_LIBS variable when
resolving the cmake path of the ABI-specific cmake directory.
Change-Id: Ibc4a1b152135d840de104c15a183b13fca0739ea
Reviewed-by: Alexandru Croitor <[email protected]>
Reviewed-by: Qt CI Bot <[email protected]>
(cherry picked from commit df8c3d40c85465027de375f656684badc6247121)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
(cherry picked from commit 539c6b6f76cd89d57506a6a540f593ed558eccc8)
(cherry picked from commit 887f2595afd217e9f28b466a400bd60e9e34ceba)
| -rw-r--r-- | src/corelib/Qt6AndroidMacros.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index 83b82f3e4ba..66f508f3b23 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -1011,7 +1011,8 @@ function(_qt_internal_get_android_abi_cmake_dir_path out_path abi) NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_INTERNAL_IS_STANDALONE_TEST) set(cmake_dir "${QT_CONFIG_BUILD_DIR}") else() - set(cmake_dir "${prefix_path}/${QT6_INSTALL_LIBS}/cmake") + string(TOUPPER "${QT_CMAKE_EXPORT_NAMESPACE}" export_namespace_upper) + set(cmake_dir "${prefix_path}/${${export_namespace_upper}_INSTALL_LIBS}/cmake") endif() endif() |