[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [mauikit] /: Android: install the android source directory
From:       Aleix Pol <null () kde ! org>
Date:       2018-09-28 0:29:40
Message-ID: E1g5gf6-0005TH-4v () code ! kde ! org
[Download RAW message or body]

Git commit 477df56237281e5f2add1ba5bc05440ac2d9ecf3 by Aleix Pol.
Committed on 28/09/2018 at 00:28.
Pushed by apol into branch 'master'.

Android: install the android source directory

It has the manifest and java code

M  +2    -0    CMakeLists.txt
M  +4    -0    MauiKitConfig.cmake.in

https://commits.kde.org/mauikit/477df56237281e5f2add1ba5bc05440ac2d9ecf3

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6e2460..2a72561 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,6 +182,8 @@ if (ANDROID)
     kde_enable_exceptions(MauiKit PRIVATE)
     target_include_directories(MauiKit PRIVATE src/android)
     install(FILES src/android/mauiandroid.h DESTINATION ${KDE_INSTALL_INCL=
UDEDIR}/MauiKit COMPONENT Devel)
+
+    install(DIRECTORY src/android/ DESTINATION ${KDE_INSTALL_DATAROOTDIR}/=
MauiKitAndroid COMPONENT Devel)
 endif()
 =

 generate_export_header(MauiKit BASE_NAME MauiKit)
diff --git a/MauiKitConfig.cmake.in b/MauiKitConfig.cmake.in
index fa6bfaa..f2c8de1 100644
--- a/MauiKitConfig.cmake.in
+++ b/MauiKitConfig.cmake.in
@@ -11,4 +11,8 @@ set(MauiKit_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX=
@")
 =

 #set(Kirigami2_LIBRARIES KF5::Kirigami2)
 =

+if(ANDROID)
+    set(MAUIKIT_ANDROID_DIR "@KDE_INSTALL_FULL_DATAROOTDIR@/MauiKitAndroid=
")
+endif()
+
 @PACKAGE_INCLUDE_QCHTARGETS@
[prev in list] [next in list] [prev in thread] [next in thread]