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

The Qbs generator must export cxxFlags to cpp.cxxFlags (#4730) #5452

Merged
merged 1 commit into from Jul 8, 2019

Conversation

@rweickelt
Copy link
Contributor

commented Jul 5, 2019

The cpp_info.cxxFlags must be exported to the cpp.cxxFlags in Qbs.
The cpp.cppFlags property has a different meaning (C preprocessor
flags).

Changelog: Bugfix: Use cxxFlags instead of cppFlags in qbs generator.
Docs: conan-io/docs#1354

Close #4730

  • [*] 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.
The Qbs generator must export cxxFlags to cpp.cxxFlags (#4730)
The cpp_info.cxxFlags must be exported to the cpp.cxxFlags in Qbs.
The cpp.cppFlags property has a different meaning  (C preprocessor
flags).

Fixes #4730
@CLAassistant

This comment has been minimized.

Copy link

commented Jul 5, 2019

CLA assistant check
All committers have signed the CLA.

@memsharded memsharded self-assigned this Jul 5, 2019

@memsharded

This comment has been minimized.

Copy link
Contributor

commented Jul 5, 2019

Nice, it seems all other generators had already changed to use cxxflags, but not this one, thanks for fixing.

It appears in the docs: https://docs.conan.io/en/latest/reference/generators/qbs.html#qbs, could you please submit a fix to it too? Note the link to the PR needs to be updated in your first comment. I will update the changelog line to specify it is a bugfix. Thanks!

@danimtb

This comment has been minimized.

Copy link
Member

commented Jul 8, 2019

I think we should keep both cppflags and the new cxxflags until 2.0 so as not to break current users

@rweickelt

This comment has been minimized.

Copy link
Contributor Author

commented Jul 8, 2019

I think we should keep both cppflags and the new cxxflags until 2.0 so as not to break current users

@danimtb, can you be more specific? Using cpp.cppFlags in Qbs for general compiler flags has always been wrong. It's a bug, not a feature change.

@memsharded

This comment has been minimized.

Copy link
Contributor

commented Jul 8, 2019

@danimtb all the other generators are using cxxflags only. What was kept for backwards compatibility is the self.cpp_info.cppflags, not the build-system part. This is a bug fix (check #4730), I was only waiting for the docs, but it can be merged.

@memsharded memsharded merged commit b5d03a2 into conan-io:develop Jul 8, 2019

2 checks passed

continuous-integration/jenkins/pr-head This commit looks good
Details
license/cla Contributor License Agreement is signed.
Details

@memsharded memsharded added this to the 1.18 milestone Jul 8, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.