Skip to content

cmake: fix traymonitor startup on windows#2423

Merged
BareosBot merged 2 commits intobareos:masterfrom
sebsura:dev/ssura/master/fix-traymonitor-startup
Nov 6, 2025
Merged

cmake: fix traymonitor startup on windows#2423
BareosBot merged 2 commits intobareos:masterfrom
sebsura:dev/ssura/master/fix-traymonitor-startup

Conversation

@sebsura
Copy link
Contributor

@sebsura sebsura commented Nov 6, 2025

When we changed how we use vcpkg (-> manifest mode) we did not update the windows installer to use the new paths.

To prevent problems in the future we now take everything (except for the openssl executable) directly from the cmake binary directory.

This is possible because qtdeploy moves everything needed by qt to that directory. In the future we should look into qt cmake support which would do this in addition to other things automatically.

Thank you for contributing to the Bareos Project!

Please check

  • Short description and the purpose of this PR is present above this paragraph
  • Your name is present in the AUTHORS file (optional)

If you have any questions or problems, please give a comment in the PR.

Helpful documentation and best practices

Checklist for the reviewer of the PR (will be processed by the Bareos team)

Make sure you check/merge the PR using devtools/pr-tool to have some simple automated checks run and a proper changelog record added.

General
  • Is the PR title usable as CHANGELOG entry?
  • Purpose of the PR is understood
  • Commit descriptions are understandable and well formatted
  • Required backport PRs have been created
  • Correct milestone is set
Source code quality
  • Source code changes are understandable
  • Variable and function names are meaningful
  • Code comments are correct (logically and spelling)
  • Required documentation changes are present and part of the PR

When we changed how we use vcpkg (-> manifest mode) we did not update
the windows installer to use the new paths.

To prevent problems in the future we now take everything (except for
the openssl executable) directly from the cmake binary directory.

This is possible because qtdeploy moves everything needed by qt to
that directory.  In the future we should look into qt cmake support
which would do this in addition to other things automatically.
@sebsura
Copy link
Contributor Author

sebsura commented Nov 6, 2025

backport to 23 is not necessary as 23 is cross-only.

Copy link
Member

@pstorz pstorz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@BareosBot BareosBot merged commit e26d83d into bareos:master Nov 6, 2025
1 check was pending
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug This addresses a bug requires backport to 24

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants