From f696be41fa945ba34b3d3e441c141ed6b6eb261f Mon Sep 17 00:00:00 2001 From: EndrII Date: Mon, 25 Oct 2021 17:13:07 +0300 Subject: [PATCH] git ignore fix --- .gitignore | 2 ++ src/Example/CMakeLists.txt | 29 ++++++++++++++----- ...oidManifest.xml => AndroidManifest.xml.in} | 0 3 files changed, 24 insertions(+), 7 deletions(-) rename src/Example/android/{AndroidManifest.xml => AndroidManifest.xml.in} (100%) diff --git a/.gitignore b/.gitignore index c3e225f..6e98a39 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,5 @@ compile_commands.json CTestTestfile.cmake _deps *_autogen* + +src/Example/android/AndroidManifest.xml diff --git a/src/Example/CMakeLists.txt b/src/Example/CMakeLists.txt index 7fcbb14..74b0e74 100644 --- a/src/Example/CMakeLists.txt +++ b/src/Example/CMakeLists.txt @@ -8,6 +8,7 @@ cmake_minimum_required(VERSION 3.14) set(CURRENT_PROJECT "${PROJECT_NAME}Eaxample") +option(SIGN_APP "This option enable od disabled sign apk and aab files" ON) file(GLOB SOURCE_CPP "*.cpp" @@ -62,14 +63,28 @@ if (ANDROID) # find_package(Qt${QT_VERSION_MAJOR} COMPONENTS AndroidExtras REQUIRED) # target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::AndroidExtras) - addDeployAPK(${CURRENT_PROJECT} - "${CMAKE_CURRENT_LIST_DIR}/android" - "QuasarAppProject" - "${SIGPATH}/quasarapp.keystore" - "${SIGPASS_QUASARAPP}" - "${TARGET_DIR}" - "${SNAKE_EXTRA_LIBS}") + if (SIGN_APP) + message("SIGN_APP") + addDeploySignedAPK(${CURRENT_PROJECT} + "${CMAKE_CURRENT_LIST_DIR}/android" + "QuasarAppProject" + "${SIGPATH}/quasarapp.keystore" + "${SIGPASS_QUASARAPP}" + "${TARGET_DIR}" + "${SNAKE_EXTRA_LIBS}") + + else() + message("NO_SIGN_APP") + + addDeployAPK(${CURRENT_PROJECT} + "${CMAKE_CURRENT_LIST_DIR}/android" + "${TARGET_DIR}" + "${SNAKE_EXTRA_LIBS}") + + endif() + set(manifest_file "${CMAKE_CURRENT_SOURCE_DIR}/android/AndroidManifest.xml") + configure_file("${manifest_file}.in" ${manifest_file} @ONLY) file(GLOB java_files "android/src/com/quasarapp/androidtools/*.java" diff --git a/src/Example/android/AndroidManifest.xml b/src/Example/android/AndroidManifest.xml.in similarity index 100% rename from src/Example/android/AndroidManifest.xml rename to src/Example/android/AndroidManifest.xml.in