From 48367f6c6b253e6ff2e3c338505205c27b6db77e Mon Sep 17 00:00:00 2001
From: Edgar <Edgar@AnotherFoxGuy.com>
Date: Wed, 9 Nov 2022 13:35:56 +0100
Subject: [PATCH] :wrench: Update ogre-next to 2022.10

---
 ogre/2.3/conandata.yml |  9 +++------
 ogre/2.3/conanfile.py  | 22 +++++++++++++++++++---
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/ogre/2.3/conandata.yml b/ogre/2.3/conandata.yml
index d50d073..46edf3d 100644
--- a/ogre/2.3/conandata.yml
+++ b/ogre/2.3/conandata.yml
@@ -1,7 +1,4 @@
 sources:
-  "2.3.1":
-    url: "https://github.com/OGRECave/ogre-next/archive/refs/tags/v2.3.1.tar.gz"
-    sha256: "38dd0d5ba5759ee47c71552c5dacf44dad5fe61868025dcbd5ea6a6bdb6bc8e4"
-patches:
-  "2.3.1":
-    - patch_file: "patches/2.3.1/RapidJSON-fix.patch"
\ No newline at end of file
+  "2022.10":
+    url: "https://github.com/OGRECave/ogre-next/archive/ede1690bb3dcf932df6a06f06e9e6de585e5eeea.tar.gz"
+    sha256: "6baf05cc4dc14cb70b6f4a958dbc7ac79a209eb9658733d0b19f651a5f96da08"
\ No newline at end of file
diff --git a/ogre/2.3/conanfile.py b/ogre/2.3/conanfile.py
index 3b18ba4..6c344da 100644
--- a/ogre/2.3/conanfile.py
+++ b/ogre/2.3/conanfile.py
@@ -42,12 +42,13 @@ class OGRENextConan(ConanFile):
 
     def generate(self):
         tc = CMakeToolchain(self)
+        tc.variables["OGRE_BUILD_COMPONENT_ATMOSPHERE"] = "ON"
         tc.variables["OGRE_BUILD_COMPONENT_BITES"] = "ON"
         tc.variables["OGRE_BUILD_COMPONENT_CSHARP"] = "OFF"
         tc.variables["OGRE_BUILD_COMPONENT_JAVA"] = "OFF"
         tc.variables["OGRE_BUILD_COMPONENT_OVERLAY_IMGUI"] = "ON"
         tc.variables["OGRE_BUILD_COMPONENT_PYTHON"] = "OFF"
-        tc.variables["OGRE_BUILD_COMPONENT_TERRAIN"] = "OFF"# This is borked
+        tc.variables["OGRE_BUILD_COMPONENT_TERRAIN"] = "ON"
         tc.variables["OGRE_BUILD_DEPENDENCIES"] = "OFF"
         tc.variables["OGRE_BUILD_PLUGIN_DOT_SCENE"] = "OFF"
         tc.variables["OGRE_BUILD_PLUGIN_EXRCODEC"] = "OFF"
@@ -71,7 +72,6 @@ class OGRENextConan(ConanFile):
             """
             find_package(RapidJSON)
             set(Rapidjson_FOUND TRUE)
-            add_library(RapidJSON::RapidJSON ALIAS rapidjson)
             """,
         )
         replace_in_file(self,
@@ -84,6 +84,11 @@ class OGRENextConan(ConanFile):
             "# Install dependencies",
             "return()",
         )
+        replace_in_file(self,
+            os.path.join(self.source_folder, "OgreMain/CMakeLists.txt"),
+            "target_link_libraries(${OGRE_NEXT}Main ${LIBRARIES})",
+            "target_link_libraries(${OGRE_NEXT}Main ${LIBRARIES} rapidjson freeimage::FreeImage)",
+        )
 
 
     def build(self):
@@ -106,17 +111,28 @@ class OGRENextConan(ConanFile):
         self.cpp_info.includedirs = [
             "include",
             "include/OGRE",
+            "include/OGRE/Animation",
+            "include/OGRE/Atmosphere",
             "include/OGRE/Bites",
+            "include/OGRE/Compositor",
+            "include/OGRE/Deprecated",
             "include/OGRE/HLMS",
+            "include/OGRE/HLMS/Common",
+            "include/OGRE/HLMS/Pbs",
+            "include/OGRE/HLMS/Unlit",
+            "include/OGRE/Math",
             "include/OGRE/MeshLodGenerator",
             "include/OGRE/Overlay",
             "include/OGRE/Paging",
             "include/OGRE/Plugins",
             "include/OGRE/Property",
-            "include/OGRE/RenderSystems",
             "include/OGRE/RTShaderSystem",
+            "include/OGRE/RenderSystems",
             "include/OGRE/Terrain",
             "include/OGRE/Threading",
+            "include/OGRE/Threading",
             "include/OGRE/Volume",
         ]
+        # Directories where libraries can be found
+        self.cpp_info.libdirs = ['lib', f'lib/{self.settings.build_type}']
         self.cpp_info.libs = collect_libs(self)