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

Meson: Fix building conntest sample without curl #2964

Merged
merged 1 commit into from
May 10, 2024

Conversation

ferdnyc
Copy link
Contributor

@ferdnyc ferdnyc commented May 10, 2024

Somewhat related to #2963 and #2961

When building with Meson the dependency logic made it impossible to build the conntest sample without curl, even though webready can be enabled in a limited, http://-only mode that doesn't require curl.

This PR separates the curl_dep dependency for libcurl from the web_dep dependency that indicates whether the webready option is enabled, in the meson configuration. The latter is now used both to determine whether EXV_ENABLE_WEBREADY should be defined, and whether conntest should be built at all.

When web_dep represents a webready-enabled configuration, curl_dep is set as a dependency. Anything depending on web_dep (currently only conntest) will be linked with libcurl iff it's available.

meson.build Show resolved Hide resolved
@neheb neheb merged commit ebd4e44 into Exiv2:main May 10, 2024
57 of 58 checks passed
@ferdnyc ferdnyc deleted the meson-sample-build branch May 11, 2024 00:07
@kmilos
Copy link
Collaborator

kmilos commented May 17, 2024

@mergify backport 0.28.x

Copy link
Contributor

mergify bot commented May 17, 2024

backport 0.28.x

✅ Backports have been created

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.

3 participants