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

Tests/modernize #8445

Merged
merged 3 commits into from Feb 8, 2021
Merged

Tests/modernize #8445

merged 3 commits into from Feb 8, 2021

Conversation

memsharded
Copy link
Member

@memsharded memsharded commented Feb 4, 2021

Changelog: Bugfix: Fixing a CMakeDeps bug with components, not finding the conan_macros.cmake file.
Docs: Omit

Fix: #8434

Also a refactor of test that highly reduce time, reusing same built package.

@memsharded memsharded added this to the 1.34 milestone Feb 4, 2021
@@ -358,7 +358,7 @@ class CMakeDeps(object):
components_target_build_type_tpl = Template(textwrap.dedent("""\
########## MACROS ###########################################################################
#############################################################################################
include(${{CMAKE_CURRENT_LIST_DIR}}/cmakedeps_macros.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/cmakedeps_macros.cmake)
Copy link
Contributor

Choose a reason for hiding this comment

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

there is no test for this, right? components and CMakeDeps is barely tested

Copy link
Member Author

Choose a reason for hiding this comment

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

Not really, I think it was partially discovered by some changes I did in the test, but not a explicit one. The thing is that we will move (copying first) all existing tests in cmake_find_package_multi to CMakeDeps, so all this will be more than covered, so it is probably not deserving its own new test for this.

@czoido czoido merged commit 3cfeda8 into conan-io:develop Feb 8, 2021
@memsharded memsharded deleted the tests/modernize branch February 8, 2021 16:47
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.

[bug] CMakeDeps not working correctly for custom filenames and target names.
3 participants