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

conan_basic_setup() same interface for cmake_multi #4721

Merged
merged 19 commits into from Mar 27, 2019

Conversation

@danimtb
Copy link
Member

@danimtb danimtb commented Mar 12, 2019

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 #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
@ghost ghost assigned danimtb Mar 18, 2019
@danimtb danimtb removed their assignment Mar 18, 2019
@danimtb
Copy link
Member Author

@danimtb danimtb commented Mar 25, 2019

Please review and merge

conans/test/functional/generators/cmake_multi_test.py Outdated Show resolved Hide resolved
conans/test/functional/generators/cmake_multi_test.py Outdated Show resolved Hide resolved
conans/client/generators/cmake_common.py Show resolved Hide resolved
@ghost ghost assigned danimtb Mar 26, 2019
@@ -511,3 +511,18 @@ class Pkg(ConanFile):

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
Member

@memsharded memsharded Mar 27, 2019

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

@@ -608,56 +632,21 @@ def generate_targets_section(dependencies):
endforeach()
endif()
endmacro()
macro(conan_flags_setup)
Copy link
Member

@memsharded memsharded Mar 27, 2019

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
Member Author

@danimtb danimtb Mar 27, 2019

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
2 checks passed
@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
Linked issues

Successfully merging this pull request may close these issues.

3 participants