From 56c61c95cffe27dc7fa3393a77bba564d89c1d0b Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Thu, 13 Oct 2022 19:32:20 +0300
Subject: [PATCH] fix meta file of snap

---
 .gitignore                                         |   1 +
 plug.pro                                           |   5 -----
 snap/gui/icon.png                                  | Bin
 src/CQtDeployer/CMakeLists.txt                     |   6 ++++--
 {snap => src/CQtDeployer/Deploy}/snapcraft.yaml.in |   0
 5 files changed, 5 insertions(+), 7 deletions(-)
 delete mode 100644 plug.pro
 mode change 100644 => 100755 snap/gui/icon.png
 rename {snap => src/CQtDeployer/Deploy}/snapcraft.yaml.in (100%)

diff --git a/.gitignore b/.gitignore
index c89766e..679556d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,6 +84,7 @@ src/CQtDeployer/Deploy/QIFW/
 src/CQtDeployer/Deploy/CQtDeployerSingle.json
 src/CQtDeployer/Deploy/QIFWTemplate/config/config.xml
 snap/snapcraft.yaml
+src/LibDeploy/src/deploy_global.h
 
 # binaries 
 testcases/bin/
diff --git a/plug.pro b/plug.pro
deleted file mode 100644
index be04603..0000000
--- a/plug.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-
-TEMPLATE = subdirs
-
-QMAKE_EXTRA_TARGETS += \
-    test
diff --git a/snap/gui/icon.png b/snap/gui/icon.png
old mode 100644
new mode 100755
diff --git a/src/CQtDeployer/CMakeLists.txt b/src/CQtDeployer/CMakeLists.txt
index 13f747e..fffd33d 100644
--- a/src/CQtDeployer/CMakeLists.txt
+++ b/src/CQtDeployer/CMakeLists.txt
@@ -79,8 +79,10 @@ configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/QIFWTem
 configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/QIFWTemplate/packages/QIF/meta/package.xml")
 
 # snap
-configure_file_in(${CURRENT_PROJECT} "${CMAKE_SOURCE_DIR}/snap/snapcraft.yaml")
-
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Deploy/snapcraft.yaml.in" "${CMAKE_SOURCE_DIR}/snap/snapcraft.yaml" @ONLY)
+add_custom_target(${name}Templates ALL
+    SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/snapcraft.yaml.in"
+)
 
 # sets qifw variable
 set(HomeDir "@HomeDir@")
diff --git a/snap/snapcraft.yaml.in b/src/CQtDeployer/Deploy/snapcraft.yaml.in
similarity index 100%
rename from snap/snapcraft.yaml.in
rename to src/CQtDeployer/Deploy/snapcraft.yaml.in