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

Add a system method for obtaining GL dependency on Linux OS #11559

Merged
merged 1 commit into from Mar 24, 2023

Conversation

helenginn
Copy link
Contributor

Following discussion #11554 highlighting the fact that although MacOS X and Windows have a special implementation to acquire the 'system' GL library, Linux does not (it may not even be shipped with the system).
This pull request provides an option for Linux operating systems to query the C compiler directly for the GL library, and then assigns the returned flags to this dependency, if it is found.

mesonbuild/dependencies/ui.py Outdated Show resolved Hide resolved
mesonbuild/dependencies/ui.py Outdated Show resolved Hide resolved
@eli-schwartz
Copy link
Member

If we remove the conditional in test cases/failing/80 gl dependency with version/meson.build it should assert that gl is found via the system dependency method.

mesonbuild/dependencies/ui.py Outdated Show resolved Hide resolved
@eli-schwartz
Copy link
Member

Thanks. Meson has a policy to prefer git commit --amend && git push -f for fixing review issues, so I have taken the liberty of squashing the commits for you after the fact... This PR looks in pretty good shape now I think, but let me take one more look.

@helenginn
Copy link
Contributor Author

Ah yes, no problem. I notice Github is still saying 'changes requested' from you, but I can't see what they are. I assume you're not waiting for me to do anything.

@eli-schwartz eli-schwartz dismissed their stale review March 23, 2023 13:04

The review has been resolved and the changes are outdated and replaced by the good stuff.

@eli-schwartz eli-schwartz merged commit 3ca56dc into mesonbuild:master Mar 24, 2023
34 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants