From b32cca62386311ec32f16c0bbf13df446ace5873 Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Tue, 27 Apr 2021 12:25:45 +0300
Subject: [PATCH] added support of the extralibs for android
---
Docs/QuasarAppCITargets.md | 3 ++-
QuasarAppCITargets.cmake | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Docs/QuasarAppCITargets.md b/Docs/QuasarAppCITargets.md
index 052e14b..2b6d065 100644
--- a/Docs/QuasarAppCITargets.md
+++ b/Docs/QuasarAppCITargets.md
@@ -47,13 +47,14 @@ This module implementation next cmake functions:
- sourceDir - Path to folder with qif template.
- config - Path to config file of qif template.
- **addDeployAPK** (name input aliase keystore keystorePass targetDir) - Add subtargets of deploy setep for create signed android apk file.
+ **addDeployAPK** (name input aliase keystore keystorePass targetDir extraLibs) - Add subtargets of deploy setep for create signed android apk file.
- name - This is prefix of added subtarget (any word).
- android_src - Path to folder with the android_manifest file.
- aliase - Alise for key store.
- keystore - Path of key store.
- keystorePass - Pass of keystore file.
- targetDir - Target directory for output apk file.
+ - extraLibs - list f the extra libraryes (like the openssl)
**add_qt_android_apk** (my_app_apk my_app) - This target add targets for the build apk file.
For get more information about this function see oficial [documentation](https://github.com/LaurentGomila/qt-android-cmake#options-of-the-add_qt_android_apk-macro
diff --git a/QuasarAppCITargets.cmake b/QuasarAppCITargets.cmake
index fb7f01d..eadc2b5 100644
--- a/QuasarAppCITargets.cmake
+++ b/QuasarAppCITargets.cmake
@@ -55,6 +55,7 @@
# - keystore - Path of key store.
# - keystorePass - Pass of keystore file.
# - targetDir - Target dir for output apk file.
+# - extraLibs - list f the extra libraryes (like the openssl)
#
# initDeploy() // Create a main deploy target for all addDeploy subtargets. This method need to call before invoiced of all addDeploy methods.
#
@@ -377,7 +378,7 @@ function(addDeployQIF name sourceDir targetDir config)
endfunction()
-function(addDeployAPK name android_src aliase keystore keystorePass targetDir)
+function(addDeployAPK name android_src aliase keystore keystorePass targetDir extraLibs)
if(TARGET deployAPK${name})
message("the deployAPK${name} target already created!")
@@ -402,6 +403,7 @@ function(addDeployAPK name android_src aliase keystore keystorePass targetDir)
PACKAGE_SOURCES ${android_src}
KEYSTORE ${keystore} ${aliase}
KEYSTORE_PASSWORD ${keystorePass}
+ DEPENDS ${extraLibs}
)
ADD_CUSTOM_TARGET(