From 29e68e6e6b9b8a7208056a0231b13cb171267b90 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 25 Jul 2021 10:42:55 +0300 Subject: [PATCH] deploy fix --- utils/blockeditor/CMakeLists.txt | 10 ++++++---- utils/qpicalculator/CMakeLists.txt | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/utils/blockeditor/CMakeLists.txt b/utils/blockeditor/CMakeLists.txt index e3a2a72..d19073e 100644 --- a/utils/blockeditor/CMakeLists.txt +++ b/utils/blockeditor/CMakeLists.txt @@ -8,8 +8,10 @@ else() endif() set(APP_INFO "Editor for BlockView Blocks") qad_application(${PROJECT_NAME} "Gui;Widgets" "qad_utils;qad_widgets;qad_blockview") -if (Qt5_FOUND) - import_version(${PROJECT_NAME}5 ${PROJECT_NAME}) - set(${PROJECT_NAME}5_INFO "${${PROJECT_NAME}_INFO}") - deploy_target(${PROJECT_NAME}5 DEPLOY_DIR ${CMAKE_CURRENT_BINARY_DIR} DESTINATION ${ROOT_DIR}/release) +if (NOT DEFINED ANDROID_PLATFORM) + if (Qt5_FOUND) + import_version(${PROJECT_NAME}5 ${PROJECT_NAME}) + set(${PROJECT_NAME}5_INFO "${${PROJECT_NAME}_INFO}") + deploy_target(${PROJECT_NAME}5 DEPLOY_DIR ${CMAKE_CURRENT_BINARY_DIR} DESTINATION ${ROOT_DIR}/release) + endif() endif() diff --git a/utils/qpicalculator/CMakeLists.txt b/utils/qpicalculator/CMakeLists.txt index 3afacf0..3603dae 100644 --- a/utils/qpicalculator/CMakeLists.txt +++ b/utils/qpicalculator/CMakeLists.txt @@ -11,10 +11,12 @@ if (PIP_FOUND) endif() set(APP_INFO "Small calculator ang grapher") qad_application(${PROJECT_NAME} "Gui;Widgets" "qad_graphic;qad_piqt") - if (Qt5_FOUND) - import_version(${PROJECT_NAME}5 ${PROJECT_NAME}) - set(${PROJECT_NAME}5_INFO "${${PROJECT_NAME}_INFO}") - deploy_target(${PROJECT_NAME}5 DEPLOY_DIR ${CMAKE_CURRENT_BINARY_DIR} DESTINATION ${ROOT_DIR}/release) + if (NOT DEFINED ANDROID_PLATFORM) + if (Qt5_FOUND) + import_version(${PROJECT_NAME}5 ${PROJECT_NAME}) + set(${PROJECT_NAME}5_INFO "${${PROJECT_NAME}_INFO}") + deploy_target(${PROJECT_NAME}5 DEPLOY_DIR ${CMAKE_CURRENT_BINARY_DIR} DESTINATION ${ROOT_DIR}/release) + endif() endif() endif()