meson: do not add gl to pkg-config file on macOS #156
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Found that this creates trouble building anything that depends on |
ebassi
requested changes
Mar 2, 2018
src/meson.build
Outdated
| @@ -93,7 +93,7 @@ epoxy_has_wgl = build_wgl ? '1' : '0' | |||
| # not needed when building Epoxy; we do want to add them to the generated | |||
| # pkg-config file, for consumers of Epoxy | |||
| gl_reqs = [] | |||
| if gl_dep.found() | |||
| if gl_dep.found() and host_system != 'darwin' | |||
There was a problem hiding this comment.
I'm pretty sure this will fail on Windows as well.
The appropriate solution would be to check the type of the gl_dep object and adding it only if it's a pkg-config dependency, e.g.
if gl_dep.found() and gl_dep.type_name() == 'pkgconfig'
gl_reqs += 'gl'
endif
Same goes for the EGL dependency:
if build_egl and egl_dep.found() and egl_dep.type_name() == 'pkgconfig'
gl_reqs += 'egl'
endif
Even though meson will find the dependency gl on macOS, this does not mean that there is a pkg-config file for it, as meson does not use pkg-config to establish its presence. It should therefore not be added to the libepoxy pkg-config file as a (private) requirement.
tschoonj
force-pushed
the
fix-gl-pkgconfig-macos
branch
from
2ee648c
to
dc5e092
Compare
|
Done! Tested on macOS. |
ebassi
approved these changes
Mar 12, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Even though meson will find the dependency gl on macOS, this does not mean that
there is a pkg-config file for it, as meson does not use pkg-config to
establish its presence. It should therefore not be added to
the libepoxy pkg-config file as a (private) requirement.