Fix module CMakeDeps vars and call find_dependency for transitive modules #10227
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
memsharded
reviewed
Dec 22, 2021
| related to https://github.com/conan-io/conan/issues/10224 | ||
| modules files variables were set with the pkg_name_FOUND or pkg_name_VERSION | ||
| instead of using filename_*, also there was missing doing a find_dependency of the | ||
| requires packages to find_package transitive dependencies |
There was a problem hiding this comment.
Nice test with clear explanation 👍
lasote
approved these changes
Dec 22, 2021
memsharded
approved these changes
Dec 22, 2021
SpaceIm
reviewed
Dec 22, 2021
Comment on lines
74
to
75
| set({{ file_name }}_INCLUDE_DIRS {{ '${' + pkg_name + '_INCLUDE_DIRS' + config_suffix + '}' }} ) | ||
| set({{ file_name }}_LIBRARIES {{ '${' + pkg_name + '_LIBRARIES' + config_suffix + '}' }} ) |
There was a problem hiding this comment.
I don't know if they are defined elsewhere, but it would be very nice to add:
<file_name>_INCLUDE_DIR> (the no S flavour of <file_name>_INCLUDE_DIRS>)
<file_name>_DEFINITIONS>
<file_name>_VERSION_STRING>
Grep _create_cmake_module_variables in CCI, you'll see that these 3 variables are recurrent.
There was a problem hiding this comment.
Can we easily add these @czoido ?
There was a problem hiding this comment.
Yes, I'll add those 👍
franramirez688
approved these changes
Dec 23, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changelog: Fix: Fix variable names set by
CMakeDepsmodules.Changelog: Fix: Call to
find_dependencyin module mode to find transitive dependencies.Changelog: Feature: Add
<PackageName>_LIBRARIES,<PackageName>_INCLUDE_DIRS,<PackageName>_INCLUDE_DIR,<PackageName>_DEFINITIONSand<PackageName>_VERSION_STRINGvariables in CMakeDeps.Docs: omit
Closes: #10224
When only
cmake_find_mode == "module"was used in CMakeDeps, transitive dependencies were not correctly found. Also, related with that variable names were not generated correctly.