Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmake: Fix some Qt DLLs not being copied due to filename patterns #11911

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

RytoEX
Copy link
Member

@RytoEX RytoEX commented Feb 28, 2025

Description

Qt has some Release DLLs that end with the letter d:

  • qdirect2d.dll
  • qcertonlybackend.dll
  • qopensslbackend.dll
  • qschannelbackend.dll

As a result, they get caught by our simple check for if a DLL is a Debug DLL which just checks if the DLL ends with the letter d.

Extend that check to exclude these specific DLLs from being marked as Debug DLLs.

Motivation and Context

Noticed these files weren't being copied.

How Has This Been Tested?

Tested locally some time last year.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)

Checklist:

  • My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the master branch.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • I have included updates to all appropriate documentation.

Qt has some Release DLLs that end with the letter d:
* qdirect2d.dll
* qcertonlybackend.dll
* qopensslbackend.dll
* qschannelbackend.dll

As a result, they get caught by our simple check for if a DLL is a Debug
DLL which just checks if the DLL ends with the letter d.

Extend that check to exclude these specific DLLs from being marked as
Debug DLLs.
@RytoEX RytoEX added the Bug Fix Non-breaking change which fixes an issue label Feb 28, 2025
@RytoEX RytoEX requested a review from PatTheMav February 28, 2025 21:54
@RytoEX RytoEX self-assigned this Feb 28, 2025
Copy link
Member

@PatTheMav PatTheMav left a comment

Choose a reason for hiding this comment

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

Annoying, but looks sensible to me.

@RytoEX
Copy link
Member Author

RytoEX commented Feb 28, 2025

Annoying, but looks sensible to me.

The only other way I could maybe think of would be to check every single filename for if a file exists with the same filename, but remove the d at the end, and see if there is still a file that exists with a d at the end of its name. That seemed painful, but I can explore that thought in the future.

@RytoEX RytoEX added this to the OBS Studio 31.1 milestone Mar 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Fix Non-breaking change which fixes an issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants