AnotherFoxGuy/ror-conan-recipes
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

🐛 Fixed compatibility with Conan 2.0

Browse Source
This commit is contained in:
Edgar
2023-03-16 11:26:56 +01:00
parent 91a339e086
commit f1c3a2dc15
3 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cg-toolkit/all/conanfile.py
View File

@ -1,6 +1,6 @@
from conan import ConanFile from conan import ConanFile
from conan.tools.files import get, collect_libs from conan.tools.files import get, collect_libs, copy
from conans.client.tools.oss import OSInfo import os
class GcConan(ConanFile): class GcConan(ConanFile):
name = "cg-toolkit" name = "cg-toolkit"
@ -12,21 +12,23 @@ class GcConan(ConanFile):
get(self, **self.conan_data["sources"][self.version], strip_root=True) get(self, **self.conan_data["sources"][self.version], strip_root=True)
def package(self): def package(self):
self.copy("*.h", src="include", dst="include") copy(self, "*.h", os.path.join(self.source_folder, "include"), os.path.join(self.package_folder,"include"))
os_info = OSInfo() if self.settings.os == "Windows":
if os_info.is_linux:
if '64' in self.settings.arch: 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: 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: else:
if '64' in self.settings.arch: if '64' in self.settings.arch:
self.copy("*.lib", src="lib64", dst="lib", keep_path=False) copy(self, "*.so", os.path.join(self.source_folder, "lib64"), os.path.join(self.package_folder,"lib"))
self.copy("*.dll", src="bin64", dst="bin", keep_path=False)
else: else:
self.copy("*.lib", src="lib", dst="lib", keep_path=False) copy(self, "*.so", os.path.join(self.source_folder, "lib"), os.path.join(self.package_folder,"lib"))
self.copy("*.dll", src="bin", dst="bin", keep_path=False)
def package_info(self): 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) self.cpp_info.libs = collect_libs(self)

2
mygui/all/conanfile.py
View File

@ -18,7 +18,7 @@ class MyGUIConan(ConanFile):
def requirements(self): def requirements(self):
if not self.options.system_ogre: if not self.options.system_ogre:
self.requires("ogre3d/[13.x]@anotherfoxguy/stable") self.requires("ogre3d/[>=1 <14]@anotherfoxguy/stable")
def source(self): def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True) get(self, **self.conan_data["sources"][self.version], strip_root=True)

11
ogre/1.11/conanfile.py
View File

@ -18,13 +18,12 @@ class OGREConan(ConanFile):
cmake_layout(self) cmake_layout(self)
def requirements(self): def requirements(self):
self.requires("zlib/[1.x]") self.requires("zlib/[~1]")
self.requires("zziplib/[0.13.x]") self.requires("zziplib/[~0]")
self.requires("freetype/[2.x]") self.requires("freetype/[~2]")
self.requires("freeimage/[3.x]") self.requires("freeimage/[~3]")
self.requires("cg-toolkit/3.1@anotherfoxguy/stable") self.requires("cg-toolkit/3.1@anotherfoxguy/stable")
self.requires("pugixml/[1.x]") self.requires("pugixml/[~1]")
self.requires("libpng/1.6.38")
if self.settings.os == "Windows": if self.settings.os == "Windows":
self.requires("directx-sdk/9.0@anotherfoxguy/stable") self.requires("directx-sdk/9.0@anotherfoxguy/stable")