From e15646d31733809fa15ec6f7815b149e6587456c Mon Sep 17 00:00:00 2001 From: EndrII Date: Mon, 25 Oct 2021 17:09:02 +0300 Subject: [PATCH] added configure deploy files --- src/Example/CMakeLists.txt | 8 ++++++- {Deploy => src/Example/Deploy}/RENAME_ME.json | 0 src/Example/Deploy/RENAME_ME.json.in | 22 +++++++++++++++++++ submodules/CMake | 2 +- 4 files changed, 30 insertions(+), 2 deletions(-) rename {Deploy => src/Example/Deploy}/RENAME_ME.json (100%) create mode 100644 src/Example/Deploy/RENAME_ME.json.in diff --git a/src/Example/CMakeLists.txt b/src/Example/CMakeLists.txt index 253d56e..7fcbb14 100644 --- a/src/Example/CMakeLists.txt +++ b/src/Example/CMakeLists.txt @@ -28,6 +28,7 @@ set(PUBLIC_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") set(PRIVATE_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Private") +updateGitVars() if (${QT_VERSION_MAJOR} EQUAL 6) @@ -85,7 +86,12 @@ if (ANDROID) else() # Desctop deploying - addDeployFromCustomFile("RENAME_ME" "${CMAKE_CURRENT_SOURCE_DIR}/../../Deploy/RENAME_ME.json") + + message(GIT_COMMIT_COUNT = ${GIT_COMMIT_COUNT}) + + set(DeployFile "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/RENAME_ME.json") + configure_file("${DeployFile}.in" ${DeployFile} @ONLY) + addDeployFromCustomFile("RENAME_ME" ${DeployFile}) endif() diff --git a/Deploy/RENAME_ME.json b/src/Example/Deploy/RENAME_ME.json similarity index 100% rename from Deploy/RENAME_ME.json rename to src/Example/Deploy/RENAME_ME.json diff --git a/src/Example/Deploy/RENAME_ME.json.in b/src/Example/Deploy/RENAME_ME.json.in new file mode 100644 index 0000000..f9cf475 --- /dev/null +++ b/src/Example/Deploy/RENAME_ME.json.in @@ -0,0 +1,22 @@ +{ + "bin": [ + "src/build/Debug/RENAME_MEEaxample", + "src/build/Debug/RENAME_MEEaxample.exe" + ], + "clear": true, + "libDir": "./../", + "recursiveDepth": "10", + "deploySystem": false, + "qmlDir": "../", + "ignoreEnv": [ + "./../installer", + "./../Distro", + "./../parts", + "./../snap", + "./../prime", + "./../stage" + ], + "extraLib": "crypto", + "targetDir": "./../DisttibutionKit" +} + diff --git a/submodules/CMake b/submodules/CMake index a36c819..d398f8c 160000 --- a/submodules/CMake +++ b/submodules/CMake @@ -1 +1 @@ -Subproject commit a36c819e1d9434567854646462be0e410505438c +Subproject commit d398f8cd8758a5b2e58eacadba49d8e718b417e6