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: do not always overwrite default cpp_std #6895

Merged
merged 1 commit into from May 18, 2020
Merged

meson: do not always overwrite default cpp_std #6895

merged 1 commit into from May 18, 2020

Conversation

TheQwertiest
Copy link
Contributor

@TheQwertiest TheQwertiest commented Apr 23, 2020

Changelog: Fix: Previously conan always set cpp_std option in meson project, even if cppstd option was not set in conan profile. Now it sets the option only if cppstd profile option has a concrete value.
Docs: Omit

Current behaviour:
Let's say we have a project with a default value of C++ standard equal to c++11:

conan cppstd meson cpp_std cmake
03 c++03 c++03
11 c++11 c++11
None none (overrides default value) c++11 (default value)

This PR makes the behaviour consistent between Cmake and Meson (relevant cmake method).

  • 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.

@TheQwertiest
Copy link
Contributor Author

@TheQwertiest TheQwertiest commented May 6, 2020

Ping. ( this issue prevents us from using conan with meson altogether =( )

PS: Current build errors are unrelated - "Internal server error".

@TheQwertiest
Copy link
Contributor Author

@TheQwertiest TheQwertiest commented May 12, 2020

Rebased to rerun tests: all green now.

@TheQwertiest
Copy link
Contributor Author

@TheQwertiest TheQwertiest commented May 18, 2020

@memsharded , ping =(

@memsharded memsharded self-assigned this May 18, 2020
@memsharded memsharded added this to the 1.26 milestone May 18, 2020
@memsharded memsharded changed the base branch from develop to release/1.25 May 18, 2020
@memsharded memsharded changed the base branch from release/1.25 to develop May 18, 2020
@memsharded
Copy link
Member

@memsharded memsharded commented May 18, 2020

Thanks for contributing this fix!
Merged, will be in next release 1.26.

If it is urgent, do you want to contribute it too to release/1.25 branch? Please open a new PR to that branch, and we can try to release it in 1.25.2 asap.

@memsharded memsharded merged commit 7f0390c into conan-io:develop May 18, 2020
1 of 2 checks passed
@TheQwertiest
Copy link
Contributor Author

@TheQwertiest TheQwertiest commented May 18, 2020

If it is urgent, do you want to contribute it too to release/1.25 branch? Please open a new PR to that branch, and we can try to release it in 1.25.2 asap.

It would be really appreciated (but only if it's not a problem for you - I don't want to skip any release tests =) ). I will open a new PR in the next 30 mins or so.

@TheQwertiest
Copy link
Contributor Author

@TheQwertiest TheQwertiest commented May 18, 2020

Opened a new PR: #7047

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