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

CMakeLists: Work around Qt shader bug with Xcode #13379

Merged
merged 1 commit into from
Jun 17, 2024

Conversation

fwcd
Copy link
Member

@fwcd fwcd commented Jun 16, 2024

Fixes #13378

This fixes a CMake configuration issue when targeting Xcode (which is needed for iOS) using the suggested workaround until the corresponding upstream Qt bug is fixed.

@fwcd fwcd mentioned this pull request Jun 16, 2024
48 tasks
@daschuer
Copy link
Member

Does this als fix am issue in the 2.4 or 2.5 branch?

@fwcd fwcd changed the base branch from main to 2.5 June 17, 2024 15:25
@fwcd
Copy link
Member Author

fwcd commented Jun 17, 2024

I have rebased it to 2.5 (2.4 doesn't contain a res/shaders/CMakeLists.txt)

Copy link
Member

@daschuer daschuer left a comment

Choose a reason for hiding this comment

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

LGTM, thank you

@daschuer daschuer merged commit 519e346 into mixxxdj:2.5 Jun 17, 2024
13 checks passed
@fwcd fwcd deleted the fix-qt-shader-bug-xcode branch June 17, 2024 16:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CMake configure regression when targeting Xcode/iOS
3 participants