Skip to content

conan_basic_setup() same interface for cmake_multi - #4721

Merged
memsharded merged 19 commits into
conan-io:developfrom
danimtb:feature/2820
Mar 27, 2019
Merged

memsharded merged 19 commits into
conan-io:developfrom
danimtb:feature/2820

Conversation

@danimtb

@danimtb danimtb commented Mar 12, 2019

Copy link
Copy Markdown
Member

Changelog: Bugfix: Use the same interface in conan_basic_setup() for the cmake_multi generator
Docs: conan-io/docs#1121

  • Refer to the issue that supports this Pull Request: closes cmake_multi basic setup #2820
  • 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.

@ghost ghost assigned danimtb Mar 12, 2019
@ghost ghost added the stage: review label Mar 12, 2019
@danimtb danimtb added this to the 1.14 milestone Mar 12, 2019
Comment thread conans/test/functional/workspace/workspace_test.py Outdated
@ghost ghost assigned danimtb Mar 18, 2019
@danimtb danimtb removed their assignment Mar 18, 2019
@danimtb

danimtb commented Mar 25, 2019

Copy link
Copy Markdown
Member Author

Please review and merge

Comment thread conans/test/functional/generators/cmake_multi_test.py Outdated
Comment thread conans/test/functional/generators/cmake_multi_test.py Outdated
Comment thread conans/client/generators/cmake_common.py
@ghost ghost assigned danimtb Mar 26, 2019
t.run("inspect {} -a description".format(reference2))
self.assertIn("description: None", t.out) # The alias conanfile doesn't have description

def alias_short_paths_test(self):

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This test doesn't belong here. It also has a print to be removed.

endif()
endmacro()

macro(conan_flags_setup)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is there any harm in leaving this macro? Even if not documented, some users might be using it, is it really necessary to remove it now?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I think it is a very old macro no one should be using, but yes, I can keep it

@memsharded
memsharded merged commit 5cde249 into conan-io:develop Mar 27, 2019
@ghost ghost removed the stage: review label Mar 27, 2019
@danimtb danimtb removed their assignment Mar 27, 2019
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.

cmake_multi basic setup

3 participants