diff options
| author | Fab Stz <fabstz-it@yahoo.fr> | 2022-10-06 13:21:11 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-01-13 11:24:22 +0000 |
| commit | 234558c1ba0096d09e6ff0fe3056a3761b3a7531 (patch) | |
| tree | f037e6068ec19bdf0643b885ee2676a072f0ac36 | |
| parent | 4649a16dc0fa59e69e252b188bffb25d35408ed3 (diff) | |
Adjust Android-related installation directories
Use the correct plugins directory when generating
dependenciencies. Install android jars to INSTALL_DATADIR.
Task-number: QTBUG-106533
Change-Id: I6b096a02bbe56fde5f4d02f1415499a735e377f2
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit ca3bf19bdf06e63bdc43ae98b1325e373eef8d1f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/position/android/jar/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/positioning/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/position/android/jar/CMakeLists.txt b/src/plugins/position/android/jar/CMakeLists.txt index 8c5d4503..39e05217 100644 --- a/src/plugins/position/android/jar/CMakeLists.txt +++ b/src/plugins/position/android/jar/CMakeLists.txt @@ -13,8 +13,10 @@ qt_internal_add_jar(Qt${QtLocation_VERSION_MAJOR}AndroidPositioning # special ca OUTPUT_DIR "${QT_BUILD_DIR}/jar" ) +qt_path_join(destination ${INSTALL_DATADIR} "jar") + install_jar(Qt${QtLocation_VERSION_MAJOR}AndroidPositioning # special case - DESTINATION jar + DESTINATION ${destination} COMPONENT Devel ) diff --git a/src/positioning/CMakeLists.txt b/src/positioning/CMakeLists.txt index f3de901c..6d842e4b 100644 --- a/src/positioning/CMakeLists.txt +++ b/src/positioning/CMakeLists.txt @@ -54,7 +54,7 @@ if(ANDROID) jar/Qt${QtLocation_VERSION_MAJOR}AndroidPositioning.jar:org.qtproject.qt.android.positioning.QtPositioning # special case ) set_property(TARGET Positioning APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES - plugins/position/libplugins_position_qtposition_android.so + ${INSTALL_PLUGINSDIR}/position/libplugins_position_qtposition_android.so ) set_property(TARGET Positioning APPEND PROPERTY QT_ANDROID_PERMISSIONS android.permission.ACCESS_FINE_LOCATION |