From 6faff48245c213a472da2e28b2c9ece31177c682 Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Tue, 13 Aug 2019 20:07:57 +0200 Subject: Define install location for JAR/AAR files for Android Summary: This follows where Qt installs those, and thus androiddeployqt looks for them. Currently this is hardcoded in knotifications for example, seems cleaner to have this here. Reviewers: #build_system, #android, apol Reviewed By: #android, apol Subscribers: apol, kde-frameworks-devel, kde-buildsystem Tags: #frameworks, #build_system Differential Revision: https://phabricator.kde.org/D23131 --- kde-modules/KDEInstallDirs.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake index a8208c05..20032234 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -130,6 +130,8 @@ # autostart files (``CONFDIR/autostart``) [``AUTOSTART_INSTALL_DIR``] # ``LOGGINGCATEGORIESDIR`` # Qt logging categories files directory (``DATAROOTDIR/qlogging-categories5``) Since 5.59.0 +# ``JARDIR`` +# Java AAR/JAR files for Android. Since 5.62.0 # # If ``KDE_INSTALL_USE_QT_SYS_PATHS`` is set to TRUE before including this # module, the default values for some variables are instead queried from @@ -589,6 +591,8 @@ _define_relative(KTEMPLATESDIR DATAROOTDIR "kdevappwizard/templates" "Kapptemplate and Kdevelop templates") _define_relative(LOGGINGCATEGORIESDIR DATAROOTDIR "qlogging-categories5" "Qt Logging categories files") +_define_relative(JARDIR "" "jar" + "Java AAR/JAR files for Android") # Cross-desktop or other system things _define_relative(ICONDIR DATAROOTDIR "icons" -- cgit v1.2.1