From f1c3a2dc1555240ec59e2d7dfd983dc0467d9a9c Mon Sep 17 00:00:00 2001
From: Edgar <Edgar@AnotherFoxGuy.com>
Date: Thu, 16 Mar 2023 11:26:56 +0100
Subject: [PATCH] :bug: Fixed compatibility with Conan 2.0

---
 cg-toolkit/all/conanfile.py | 28 +++++++++++++++-------------
 mygui/all/conanfile.py      |  2 +-
 ogre/1.11/conanfile.py      | 11 +++++------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/cg-toolkit/all/conanfile.py b/cg-toolkit/all/conanfile.py
index 0448240..393b702 100644
--- a/cg-toolkit/all/conanfile.py
+++ b/cg-toolkit/all/conanfile.py
@@ -1,6 +1,6 @@
 from conan import ConanFile
-from conan.tools.files import get, collect_libs
-from conans.client.tools.oss import OSInfo
+from conan.tools.files import get, collect_libs, copy
+import os
 
 class GcConan(ConanFile):
     name = "cg-toolkit"
@@ -12,21 +12,23 @@ class GcConan(ConanFile):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
     def package(self):
-        self.copy("*.h", src="include", dst="include")
-        os_info = OSInfo()
-        if os_info.is_linux:
+        copy(self, "*.h", os.path.join(self.source_folder, "include"), os.path.join(self.package_folder,"include"))
+        if self.settings.os == "Windows":
             if '64' in self.settings.arch:
-                self.copy("*.so", src="lib64", dst="lib", keep_path=False)
+                #copy(self, "*.h", self.source_folder, os.path.join(self.package_folder, "include"))
+                copy(self, "*.lib", os.path.join(self.source_folder, "lib64"), os.path.join(self.package_folder,"lib"))
+                copy(self, "*.dll", os.path.join(self.source_folder, "bin64"), os.path.join(self.package_folder,"bin"))
             else:
-                self.copy("*.so", src="lib", dst="lib", keep_path=False)
+                copy(self, "*.lib", os.path.join(self.source_folder, "lib"), os.path.join(self.package_folder,"lib"))
+                copy(self, "*.dll", os.path.join(self.source_folder, "bin"), os.path.join(self.package_folder,"bin"))
         else:
             if '64' in self.settings.arch:
-                self.copy("*.lib", src="lib64", dst="lib", keep_path=False)
-                self.copy("*.dll", src="bin64", dst="bin", keep_path=False)
+                copy(self, "*.so", os.path.join(self.source_folder, "lib64"), os.path.join(self.package_folder,"lib"))
             else:
-                self.copy("*.lib", src="lib", dst="lib", keep_path=False)
-                self.copy("*.dll", src="bin", dst="bin", keep_path=False)
-
+                copy(self, "*.so", os.path.join(self.source_folder, "lib"), os.path.join(self.package_folder,"lib"))
     def package_info(self):
-        self.cpp_info.name = "Cg"
+        self.cpp_info.set_property("cmake_module_file_name", "Cg")
+        self.cpp_info.set_property("cmake_module_target_name", "Cg::Cg")
+        self.cpp_info.set_property("cmake_file_name", "Cg")
+        self.cpp_info.set_property("cmake_target_name", "Cg::Cg")
         self.cpp_info.libs = collect_libs(self)
diff --git a/mygui/all/conanfile.py b/mygui/all/conanfile.py
index 559a708..a18af02 100644
--- a/mygui/all/conanfile.py
+++ b/mygui/all/conanfile.py
@@ -18,7 +18,7 @@ class MyGUIConan(ConanFile):
 
     def requirements(self):
         if not self.options.system_ogre:
-            self.requires("ogre3d/[13.x]@anotherfoxguy/stable")
+            self.requires("ogre3d/[>=1 <14]@anotherfoxguy/stable")
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)
diff --git a/ogre/1.11/conanfile.py b/ogre/1.11/conanfile.py
index 3b4df74..f8f32c3 100644
--- a/ogre/1.11/conanfile.py
+++ b/ogre/1.11/conanfile.py
@@ -18,13 +18,12 @@ class OGREConan(ConanFile):
         cmake_layout(self)
 
     def requirements(self):
-        self.requires("zlib/[1.x]")
-        self.requires("zziplib/[0.13.x]")
-        self.requires("freetype/[2.x]")
-        self.requires("freeimage/[3.x]")
+        self.requires("zlib/[~1]")
+        self.requires("zziplib/[~0]")
+        self.requires("freetype/[~2]")
+        self.requires("freeimage/[~3]")
         self.requires("cg-toolkit/3.1@anotherfoxguy/stable")
-        self.requires("pugixml/[1.x]")
-        self.requires("libpng/1.6.38")
+        self.requires("pugixml/[~1]")
         if self.settings.os == "Windows":
             self.requires("directx-sdk/9.0@anotherfoxguy/stable")