From 25452289a3f0136299d6c2c8f09956e2731fca44 Mon Sep 17 00:00:00 2001 From: Edgar Date: Wed, 23 Mar 2022 16:49:03 +0100 Subject: [PATCH] :bug: Fixed ogre-* package compatibility --- ogre-caelum/all/conandata.yml | 5 ++++- ogre-caelum/all/conanfile.py | 2 +- ogre-pagedgeometry/all/conandata.yml | 5 ++++- ogre-pagedgeometry/all/conanfile.py | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ogre-caelum/all/conandata.yml b/ogre-caelum/all/conandata.yml index fd07141..0d235fb 100644 --- a/ogre-caelum/all/conandata.yml +++ b/ogre-caelum/all/conandata.yml @@ -11,4 +11,7 @@ patches: "0.6.4": - patch_file: "patches/0.6.4/CMakeLists.txt.patch" requirements: - - "ogre3d/[1.x]@anotherfoxguy/stable" \ No newline at end of file + "0.6.3": + - "ogre3d/[1.x]@anotherfoxguy/stable" + "0.6.4": + - "ogre3d/[13.x]@anotherfoxguy/stable" \ No newline at end of file diff --git a/ogre-caelum/all/conanfile.py b/ogre-caelum/all/conanfile.py index 30f8d68..c40f95c 100644 --- a/ogre-caelum/all/conanfile.py +++ b/ogre-caelum/all/conanfile.py @@ -11,7 +11,7 @@ class CaelumConan(ConanFile): exports_sources = "patches/**" def requirements(self): - for req in self.conan_data["requirements"]: + for req in self.conan_data["requirements"][self.version]: self.requires(req) def source(self): diff --git a/ogre-pagedgeometry/all/conandata.yml b/ogre-pagedgeometry/all/conandata.yml index ecf1092..08fb024 100644 --- a/ogre-pagedgeometry/all/conandata.yml +++ b/ogre-pagedgeometry/all/conandata.yml @@ -11,4 +11,7 @@ patches: "1.3.0": - patch_file: "patches/1.3.0/CMakeLists.txt.patch" requirements: - - "ogre3d/[1.x]@anotherfoxguy/stable" \ No newline at end of file + "1.2.0": + - "ogre3d/[1.x]@anotherfoxguy/stable" + "1.3.0": + - "ogre3d/[13.x]@anotherfoxguy/stable" \ No newline at end of file diff --git a/ogre-pagedgeometry/all/conanfile.py b/ogre-pagedgeometry/all/conanfile.py index 69aa669..89c12af 100644 --- a/ogre-pagedgeometry/all/conanfile.py +++ b/ogre-pagedgeometry/all/conanfile.py @@ -11,7 +11,7 @@ class PagedGeometryConan(ConanFile): exports_sources = "patches/**" def requirements(self): - for req in self.conan_data["requirements"]: + for req in self.conan_data["requirements"][self.version]: self.requires(req) def source(self):