🚚 Moved OGRE to different subfolder

ogre/1.11/conandata.yml

@@ -1,11 +1,12 @@
 sources:
   "1.11.6.1":
-    url: "https://github.com/only-a-ptr/ogre/archive/0ee9c1761cb90e8864ae9b93d9901affa5522444.zip"
+    url: "https://github.com/AnotherFoxGuy/ogre/archive/refs/tags/1.11.6.1.tar.gz"
     sha256: "e58f2fc55bad64f75a43b309ccfaccdb0b9889fbed20547e51f10d7d4824ab9f"
 patches:
   "1.11.6.1":
     - patch_file: "patches/1.11.6.1/CMakeLists.txt.patch"
     - patch_file: "patches/1.11.6.1/Dependencies.cmake.patch"
+    - patch_file: "patches/1.11.6.1/Samples-CMakeList.txt.patch"
 requirements:
   - "zlib/[1.x]"
   - "zziplib/[0.13.x]"

ogre/1.11/conanfile.py

@@ -1,71 +1,71 @@
-from conans import ConanFile, CMake, tools
+from conans import ConanFile, CMake, tools
-from conans.tools import os_info, SystemPackageTool
+from conans.tools import os_info, SystemPackageTool
-
+
-
+
-class OGREConan(ConanFile):
+class OGREConan(ConanFile):
-    name = "ogre3d"
+    name = "ogre3d"
-    license = "MIT"
+    license = "MIT"
-    url = "https://github.com/AnotherFoxGuy/conan-OGRE"
+    url = "https://github.com/AnotherFoxGuy/conan-OGRE"
-    description = "scene-oriented, flexible 3D engine written in C++"
+    description = "scene-oriented, flexible 3D engine written in C++"
-    settings = "os", "compiler", "build_type", "arch"
+    settings = "os", "compiler", "build_type", "arch"
-    generators = "cmake_paths"
+    generators = "cmake_paths"
-    exports_sources = "patches/**"
+    exports_sources = "patches/**"
-
+
-    def requirements(self):
+    def requirements(self):
-        for req in self.conan_data["requirements"]:
+        for req in self.conan_data["requirements"]:
-            self.requires(req)
+            self.requires(req)
-
+
-    def system_requirements(self):
+    def system_requirements(self):
-        if os_info.is_linux:
+        if os_info.is_linux:
-            if os_info.with_apt:
+            if os_info.with_apt:
-                installer = SystemPackageTool()
+                installer = SystemPackageTool()
-                installer.install("libx11-dev")
+                installer.install("libx11-dev")
-                installer.install("libxaw7-dev")
+                installer.install("libxaw7-dev")
-
+
-    def source(self):
+    def source(self):
-        tools.get(**self.conan_data["sources"][self.version], strip_root=True)
+        tools.get(**self.conan_data["sources"][self.version], strip_root=True)
-        for patch in self.conan_data["patches"][self.version]:
+        for patch in self.conan_data["patches"][self.version]:
-            tools.patch(**patch)
+            tools.patch(**patch)
-
+
-    def build(self):
+    def build(self):
-        cmake = CMake(self)
+        cmake = CMake(self)
-        cmake.definitions["OGRE_BUILD_DEPENDENCIES"] = "OFF"
+        cmake.definitions["OGRE_BUILD_DEPENDENCIES"] = "OFF"
-        cmake.definitions["OGRE_BUILD_COMPONENT_OVERLAY_IMGUI"] = "ON"
+        cmake.definitions["OGRE_BUILD_COMPONENT_OVERLAY_IMGUI"] = "ON"
-        cmake.definitions["OGRE_BUILD_COMPONENT_CSHARP"] = "OFF"
+        cmake.definitions["OGRE_BUILD_COMPONENT_CSHARP"] = "OFF"
-        cmake.definitions["OGRE_BUILD_COMPONENT_JAVA"] = "OFF"
+        cmake.definitions["OGRE_BUILD_COMPONENT_JAVA"] = "OFF"
-        cmake.definitions["OGRE_BUILD_COMPONENT_PYTHON"] = "OFF"
+        cmake.definitions["OGRE_BUILD_COMPONENT_PYTHON"] = "OFF"
-        cmake.definitions["OGRE_BUILD_PLUGIN_STBI"] = "OFF"
+        cmake.definitions["OGRE_BUILD_PLUGIN_STBI"] = "OFF"
-        cmake.definitions["OGRE_BUILD_COMPONENT_BITES"] = "ON"
+        cmake.definitions["OGRE_BUILD_COMPONENT_BITES"] = "ON"
-        cmake.definitions["OGRE_BUILD_SAMPLES"] = "OFF"
+        cmake.definitions["OGRE_BUILD_SAMPLES"] = "OFF"
-        cmake.definitions["OGRE_BUILD_RENDERSYSTEM_D3D9"] = "ON"
+        cmake.definitions["OGRE_BUILD_RENDERSYSTEM_D3D9"] = "ON"
-        cmake.definitions["OGRE_BUILD_RENDERSYSTEM_D3D11"] = "ON"
+        cmake.definitions["OGRE_BUILD_RENDERSYSTEM_D3D11"] = "ON"
-        cmake.definitions["OGRE_BUILD_RENDERSYSTEM_GL3PLUS"] = "OFF"
+        cmake.definitions["OGRE_BUILD_RENDERSYSTEM_GL3PLUS"] = "OFF"
-        cmake.definitions["OGRE_RESOURCEMANAGER_STRICT"] = 0
+        cmake.definitions["OGRE_RESOURCEMANAGER_STRICT"] = 0
-        cmake.definitions["OGRE_INSTALL_SAMPLES"] = "OFF"
+        cmake.definitions["OGRE_INSTALL_SAMPLES"] = "OFF"
-        if os_info.is_windows:
+        if os_info.is_windows:
-            cmake.definitions["CMAKE_CXX_FLAGS"] = "-D_OGRE_FILESYSTEM_ARCHIVE_UNICODE"
+            cmake.definitions["CMAKE_CXX_FLAGS"] = "-D_OGRE_FILESYSTEM_ARCHIVE_UNICODE"
-        cmake.configure()
+        cmake.configure()
-        cmake.build()
+        cmake.build()
-
+
-    def package(self):
+    def package(self):
-        cmake = CMake(self)
+        cmake = CMake(self)
-        cmake.install()
+        cmake.install()
-
+
-    def package_info(self):
+    def package_info(self):
-        self.cpp_info.includedirs = [
+        self.cpp_info.includedirs = [
-            "include",
+            "include",
-            "include/OGRE",
+            "include/OGRE",
-            "include/OGRE/Bites",
+            "include/OGRE/Bites",
-            "include/OGRE/HLMS",
+            "include/OGRE/HLMS",
-            "include/OGRE/MeshLodGenerator",
+            "include/OGRE/MeshLodGenerator",
-            "include/OGRE/Overlay",
+            "include/OGRE/Overlay",
-            "include/OGRE/Paging",
+            "include/OGRE/Paging",
-            "include/OGRE/Plugins",
+            "include/OGRE/Plugins",
-            "include/OGRE/Property",
+            "include/OGRE/Property",
-            "include/OGRE/RenderSystems",
+            "include/OGRE/RenderSystems",
-            "include/OGRE/RTShaderSystem",
+            "include/OGRE/RTShaderSystem",
-            "include/OGRE/Terrain",
+            "include/OGRE/Terrain",
-            "include/OGRE/Threading",
+            "include/OGRE/Threading",
-            "include/OGRE/Volume",
+            "include/OGRE/Volume",
-        ]
+        ]
-        self.cpp_info.libs = tools.collect_libs(self)
+        self.cpp_info.libs = tools.collect_libs(self)

ogre/1.11/patches/1.11.6.1/Samples-CMakeList.txt.patch

@@ -0,0 +1,11 @@
+--- Samples/CMakeLists.txt
++++ Samples/CMakeLists.txt
+@@ -108,7 +108,7 @@
+ install(FILES ${SAMPLE_COMMON_HEADERS}
+ 		DESTINATION include/OGRE)
+ 		
+-if (MSVC)
++if (_NOT_USED)
+   find_package(Wix)
+   if (Wix_FOUND)
+     # Create WiX setup for demo build

ogre/config.yml

@@ -1,3 +1,3 @@
 versions:
-  "1.11.6.1:
+  "1.11.6.1":
-    folder: all
+    folder: "1.11"