Skip to content

Commit

Permalink
Merge pull request #734 from QuasarApp/fixOutputs
Browse files Browse the repository at this point in the history
Fix deploy output
  • Loading branch information
EndrII committed Nov 2, 2022
2 parents 388becc + d8f6693 commit 24847be
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 12 deletions.
14 changes: 13 additions & 1 deletion md/en/Changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
# Change log

## CQtDeployer 1.6
## CQtDeployer v1.6.2265

### What's Changed

* Added sources into documentation by @EndrII in https://github.com/QuasarApp/CQtDeployer/pull/727
* Added article for building cqtdeployer on arm platforms by @EndrII in https://github.com/QuasarApp/CQtDeployer/pull/726
* Update zip submodule by @EndrII in https://github.com/QuasarApp/CQtDeployer/pull/730
* Added the qml files dialogs test by @EndrII in https://github.com/QuasarApp/CQtDeployer/pull/729
* Added the dynamic detection qt version and qt platform properties by @EndrII in https://github.com/QuasarApp/CQtDeployer/pull/733
* Fix warning: ``run qmake file! execve: Permission denied`` by @EndrII in https://github.com/QuasarApp/CQtDeployer/pull/732


## CQtDeployer 1.6.2227

### New features

Expand Down
22 changes: 11 additions & 11 deletions src/CQtDeployer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,17 @@ set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts

prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR}/../ "${LANGS}")

# sets qifw variable
set(ApplicationsDir "@HomeDir@")
set(QIFW_PLATFORM linux)
set(INSTALLER_SUFIX ".run")
if (WIN32)
set(QIFW_PLATFORM windows)
set(INSTALLER_SUFIX ".exe")
set(ApplicationsDir "@ApplicationsDir@")

endif()

configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/CQtDeployer.json")
configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/CQtDeployerSingle.json")

Expand All @@ -84,17 +95,6 @@ add_custom_target(${name}Templates ALL
SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/snapcraft.yaml.in"
)

# sets qifw variable
set(ApplicationsDir "@HomeDir@")
set(QIFW_PLATFORM linux)
set(INSTALLER_SUFIX .run)
if (WIN32)
set(QIFW_PLATFORM windows)
set(INSTALLER_SUFIX exe)
set(ApplicationsDir "@ApplicationsDir@")

endif()

configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/QIFWTemplate/config/config.xml")


Expand Down

0 comments on commit 24847be

Please sign in to comment.