diff --git a/ogre-pagedgeometry/all/conandata.yml b/ogre-pagedgeometry/all/conandata.yml index 08fb024..77688b4 100644 --- a/ogre-pagedgeometry/all/conandata.yml +++ b/ogre-pagedgeometry/all/conandata.yml @@ -4,14 +4,4 @@ sources: sha256: "513043eecf1aaf6f8b2335c953b0664128aa492007fe3d93068e5f4be436093a" "1.3.0": url: "https://github.com/OGRECave/ogre-pagedgeometry/archive/18ca8a0abd26cb5d52b99ad8e8fa0c8f7e6e7d79.zip" - sha256: "4a3d97d75f7417208403bd0f5e8c3b010ae0dd9a36968f78ecc5cd0161b2ddb9" -patches: - "1.2.0": - - patch_file: "patches/1.2.0/CMakeLists.txt.patch" - "1.3.0": - - patch_file: "patches/1.3.0/CMakeLists.txt.patch" -requirements: - "1.2.0": - - "ogre3d/[1.x]@anotherfoxguy/stable" - "1.3.0": - - "ogre3d/[13.x]@anotherfoxguy/stable" \ No newline at end of file + sha256: "4a3d97d75f7417208403bd0f5e8c3b010ae0dd9a36968f78ecc5cd0161b2ddb9" \ No newline at end of file diff --git a/ogre-pagedgeometry/all/conanfile.py b/ogre-pagedgeometry/all/conanfile.py index 89c12af..9b53869 100644 --- a/ogre-pagedgeometry/all/conanfile.py +++ b/ogre-pagedgeometry/all/conanfile.py @@ -1,40 +1,47 @@ -from conans import ConanFile, CMake, tools - - -class PagedGeometryConan(ConanFile): - name = "ogre3d-pagedgeometry" - license = "GNU Lesser General Public License v2.1" - url = "https://github.com/RigsOfRods/Caelum/issues" - description = "PagedGeometry is a plugin for OGRE for rendering of dense vegetation " - settings = "os", "compiler", "build_type", "arch" - generators = "cmake_find_package" - exports_sources = "patches/**" - - def requirements(self): - for req in self.conan_data["requirements"][self.version]: - self.requires(req) - - def source(self): - tools.get(**self.conan_data["sources"][self.version], strip_root=True) - for patch in self.conan_data["patches"][self.version]: - tools.patch(**patch) - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def package(self): - cmake = CMake(self) - cmake.install() - - def package_info(self): - self.cpp_info.name = "PagedGeometry" - self.cpp_info.includedirs = [ - 'include', - 'include/PagedGeometry' - ] - self.cpp_info.libs = tools.collect_libs(self) - - def package_id(self): - self.info.requires["ogre3d"].full_recipe_mode() +from conan import ConanFile +from conan.tools.files import get, collect_libs +from conan.tools.cmake import CMakeToolchain, CMake, CMakeDeps, cmake_layout + + +class PagedGeometryConan(ConanFile): + name = "ogre3d-pagedgeometry" + license = "GNU Lesser General Public License v2.1" + url = "https://github.com/RigsOfRods/Caelum/issues" + description = "PagedGeometry is a plugin for OGRE for rendering of dense vegetation " + settings = "os", "compiler", "build_type", "arch" + + def layout(self): + cmake_layout(self) + + def requirements(self): + self.requires("ogre3d/[13.x]@anotherfoxguy/stable") + self.requires("libpng/1.6.38") + + def source(self): + get(self, **self.conan_data["sources"][self.version], strip_root=True) + + def generate(self): + tc = CMakeToolchain(self) + tc.generate() + deps = CMakeDeps(self) + deps.generate() + + def build(self): + cmake = CMake(self) + cmake.configure() + cmake.build() + + def package(self): + cmake = CMake(self) + cmake.install() + + def package_info(self): + self.cpp_info.name = "PagedGeometry" + self.cpp_info.includedirs = [ + 'include', + 'include/PagedGeometry' + ] + self.cpp_info.libs = collect_libs(self) + + def package_id(self): + self.info.requires["ogre3d"].full_recipe_mode() \ No newline at end of file