ignition-utils: fix v1 support

conan-io · Nov 27, 2023 · 661b17a · 661b17a
1 parent f7e477d
commit 661b17a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/recipes/ignition-utils/all/conanfile.py b/recipes/ignition-utils/all/conanfile.py
@@ -9,7 +9,7 @@
 from conan.tools.files import copy, get, rm, rmdir, save, replace_in_file
 from conan.tools.scm import Version
 
-required_conan_version = ">=1.53.0"
+required_conan_version = ">=1.56.0 <2 || >=2.0.6"
 
 
 class IgnitionUitlsConan(ConanFile):
@@ -59,6 +59,7 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
+        self.requires("ignition-cmake/2.10.0", private=True)
         if self.options.ign_utils_vendor_cli11:
             self.requires("cli11/2.3.2")
 
@@ -78,7 +79,7 @@ def validate(self):
                 )
 
     def build_requirements(self):
-        self.tool_requires("ignition-cmake/2.10.0")
+        self.tool_requires("ignition-cmake/<host_version>")
         self.tool_requires("doxygen/1.9.4")
 
     def source(self):
@@ -91,8 +92,6 @@ def generate(self):
         tc.variables["CMAKE_FIND_DEBUG_MODE"] = True
         tc.generate()
         deps = CMakeDeps(self)
-        deps.build_context_activated = ["ignition-cmake"]
-        deps.build_context_build_modules = ["ignition-cmake"]
         deps.generate()
 
     def _patch_sources(self):

diff --git a/recipes/ignition-utils/all/test_package/conanfile.py b/recipes/ignition-utils/all/test_package/conanfile.py
@@ -12,10 +12,11 @@ class TestPackageConan(ConanFile):
     test_type = "explicit"
 
     def requirements(self):
+        self.requires("ignition-cmake/2.10.0", private=True)
         self.requires(self.tested_reference_str)
 
     def build_requirements(self):
-        self.tool_requires("ignition-cmake/2.10.0")
+        self.tool_requires("ignition-cmake/<host_version>")
         self.tool_requires("doxygen/1.9.4")
 
     def layout(self):
@@ -26,8 +27,6 @@ def generate(self):
         tc.variables["IGN_UTILS_MAJOR_VER"] = Version(self.dependencies["ignition-utils"].ref.version).major
         tc.generate()
         deps = CMakeDeps(self)
-        deps.build_context_activated = ["ignition-cmake"]
-        deps.build_context_build_modules = ["ignition-cmake"]
         deps.generate()
 
     def build(self):