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

Bugfix: wrapped exelinkflags and sharedlinkflags with generator expressions #6780

Conversation

hardsetting
Copy link
Contributor

@hardsetting hardsetting commented Apr 2, 2020

Closes #6779

Changelog: Bugfix: Changed the CMake generator template to properly handle exelinkflags and sharedlinkflags using generator expressions.
Docs: omit

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

Note: By default this PR will skip the slower tests and will use a limited set of python versions. Check here how to increase the testing level by writing some tags in the current PR body text.

#TAGS: slow

@CLAassistant
Copy link

@CLAassistant CLAassistant commented Apr 2, 2020

CLA assistant check
All committers have signed the CLA.

@jgsogo jgsogo added this to the 1.25 milestone Apr 2, 2020
@jgsogo
Copy link
Member

@jgsogo jgsogo commented Apr 2, 2020

Hi! Thanks for taking care of the issue.

This change is probably needed in other generators as well, like here because we are creating a single list with those flags. I'm just guessing, I haven't checked the actual targets and properties.

@jgsogo jgsogo self-assigned this Apr 3, 2020
@jgsogo jgsogo unassigned SSE4 Apr 29, 2020
@jgsogo jgsogo force-pushed the feature/cmake_exelinkflags_sharedlinkflags_fix branch 3 times, most recently from 7e9eac4 to 4b0ab0f Compare Apr 29, 2020
@jgsogo jgsogo force-pushed the feature/cmake_exelinkflags_sharedlinkflags_fix branch from 4b0ab0f to f36a474 Compare Apr 29, 2020
@@ -144,7 +144,8 @@ def setUpClass(cls):

def _validate_link_order(self, libs):
# Check that all the libraries are there:
self.assertEqual(len(libs), 19 if platform.system() == "Darwin" else 16 if platform.system() == "Linux" else 26)
self.assertEqual(len(libs), 19 if platform.system() == "Darwin" else 16 if platform.system() == "Linux" else 26,
msg="Unexpected number of libs ({}): '{}'".format(len(libs), "', '".join(libs)))
Copy link
Member

@jgsogo jgsogo Apr 29, 2020

Choose a reason for hiding this comment

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

There are some line-length violations in this file. I'm changing them here #6932

@jgsogo jgsogo requested a review from memsharded Apr 29, 2020
Copy link
Member

@memsharded memsharded left a comment

Great job

@memsharded memsharded merged commit 453a390 into conan-io:develop Apr 30, 2020
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.

5 participants