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

Feature/meson subproject #15916

Merged
merged 11 commits into from
Mar 25, 2024

Conversation

fnadeau
Copy link
Contributor

@fnadeau fnadeau commented Mar 22, 2024

Changelog: Feature: Add support for meson subproject.
Docs: conan-io/docs#3655

Issue related to this PR #15886

  • Refer to the issue that supports this Pull Request.
  • If the issue has missing info, explain the purpose/use case/pain/need that covers this Pull Request.
  • I've read the Contributing guide.
  • I've followed the PEP8 style guides for Python code.
  • I've opened another PR in the Conan docs repo to the develop branch, documenting this one.
    • PR has been open for branch develop2

@CLAassistant
Copy link

CLAassistant commented Mar 22, 2024

CLA assistant check
All committers have signed the CLA.

@memsharded memsharded added this to the 2.3.0 milestone Mar 24, 2024
Copy link
Contributor

@franramirez688 franramirez688 left a comment

Choose a reason for hiding this comment

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

@fnadeau LGTM! 👍 Thank you for the PR, it's ready to be merged 👏

I just added a couple of commits changing some minor things in the test.

@franramirez688
Copy link
Contributor

franramirez688 commented Mar 25, 2024

I think that it's failing because of the Meson version in the CI

UPDATED: Checking the official documentation https://mesonbuild.com/Build-options.html. It reads so:

.... For versions of meson before 1.1, this file was called meson_options.txt.

In summary, renamed meson.options to meson_options.txt

@franramirez688 franramirez688 merged commit 87a7a1a into conan-io:develop2 Mar 25, 2024
2 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.

4 participants