diff --git a/.gitignore b/.gitignore index c89766ea..679556d9 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 be046039..00000000 --- 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 13f747e4..fffd33d8 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