Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion conan/internal/api/install/generators.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ def _receive_generators(conanfile):
names = [c.__name__ if not isinstance(c, str) else c for c in build_req.generator_info]
conanfile.output.warning(f"Tool-require {build_req} adding generators: {names}",
warn_tag="experimental")
conanfile.generators = build_req.generator_info + conanfile.generators
# Generators can be defined as a tuple in recipes, ensure we don't break if so
conanfile.generators = build_req.generator_info + list(conanfile.generators)


def _generate_aggregated_env(conanfile):
Expand Down
8 changes: 7 additions & 1 deletion test/integration/generators/test_generators_from_br.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,18 @@ def package_info(self):
self.generator_info = ["CMakeToolchain", MyGenerator]
""")})

tc.save({"consumer/conanfile.py": GenConanfile("consumer", "0.1")
.with_tool_requires("tool/0.1")
.with_class_attribute("generators = 'VirtualBuildEnv', 'VirtualRunEnv'")})

tc.run("create tool")
tc.run("install --tool-requires=tool/0.1")
tc.run("create consumer")
assert "WARN: experimental: Tool-require tool/0.1 adding generators: " \
"['CMakeToolchain', 'MyGenerator']" in tc.out
assert "Generator 'CMakeToolchain' calling 'generate()'" in tc.out
assert "Generator 'MyGenerator' calling 'generate()'" in tc.out
assert "Generator 'VirtualBuildEnv' calling 'generate()'" in tc.out
assert "Generator 'VirtualRunEnv' calling 'generate()'" in tc.out
assert "CMakeToolchain generated: conan_toolchain.cmake" in tc.out
assert "MyGenerator generated" in tc.out

Expand Down