diff --git a/recipes/makefile-project-workspace-creator/all/test_package/conanfile.py b/recipes/makefile-project-workspace-creator/all/test_package/conanfile.py index 40b0ebc3a240fa..5940c447f9c8cd 100644 --- a/recipes/makefile-project-workspace-creator/all/test_package/conanfile.py +++ b/recipes/makefile-project-workspace-creator/all/test_package/conanfile.py @@ -1,10 +1,10 @@ -from conan import ConanFile +from conan import ConanFile, conan_version from conan.tools.layout import basic_layout class TestPackageConan(ConanFile): settings = "os", "arch", "compiler", "build_type" - generators = "VirtualBuildEnv" + generators = "VirtualBuildEnv", "VirtualRunEnv" test_type = "explicit" def layout(self): @@ -12,6 +12,8 @@ def layout(self): def build_requirements(self): self.tool_requires(self.tested_reference_str) + if conan_version.major < 2 and self.settings.os == "Windows": + self.tool_requires("strawberryperl/5.32.1.1") def test(self): self.run("perl -S mpc.pl --version") diff --git a/recipes/makefile-project-workspace-creator/all/test_v1_package/conanfile.py b/recipes/makefile-project-workspace-creator/all/test_v1_package/conanfile.py index d02d604b53d44b..282c575f86807b 100644 --- a/recipes/makefile-project-workspace-creator/all/test_v1_package/conanfile.py +++ b/recipes/makefile-project-workspace-creator/all/test_v1_package/conanfile.py @@ -7,6 +7,10 @@ class DefaultNameConan(ConanFile): def build(self): pass + def build_requirements(self): + if self.settings.os == "Windows": + self.tool_requires("strawberryperl/5.32.1.1") + def test(self): if not tools.cross_building(self.settings): self.run("perl -S mpc.pl --version", run_environment=True)