From 1706c959b256650e1fbdd209db05d186a8ffce0a Mon Sep 17 00:00:00 2001 From: Edgar Date: Sat, 21 Aug 2021 14:26:35 +0000 Subject: [PATCH] :bug: Fixed ogre pkg compatibility --- build.py | 9 ++++++--- mygui/all/conanfile.py | 3 +++ ogre-caelum/all/conanfile.py | 3 +++ ogre-pagedgeometry/all/conanfile.py | 3 +++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/build.py b/build.py index 21e29bb..620f022 100644 --- a/build.py +++ b/build.py @@ -1,10 +1,12 @@ #!/usr/bin/env python3 -import os, sys +import os +import sys import platform from glob import glob import yaml import subprocess + def system(command): retcode = os.system(command) if retcode != 0: @@ -34,7 +36,8 @@ for pkg in packages: system(f"conan create {pkg} -s=build_type=Debug -k -b=outdated") -data = list(filter(lambda k: 'anotherfoxguy' in k, subprocess.run(['conan','search','*','--raw'], stdout=subprocess.PIPE).stdout.decode("utf-8").split())) +data = list(filter(lambda k: 'anotherfoxguy' in k, subprocess.run( + ['conan', 'search', '*', '--raw'], stdout=subprocess.PIPE).stdout.decode("utf-8").split())) for d in data: - system(f"conan upload {d} -r ror-v2 --all --force") \ No newline at end of file + system(f"conan upload {d} -r ror-v2 --all --force") diff --git a/mygui/all/conanfile.py b/mygui/all/conanfile.py index 740db3c..7a0edbe 100644 --- a/mygui/all/conanfile.py +++ b/mygui/all/conanfile.py @@ -40,3 +40,6 @@ class MyGUIConan(ConanFile): # Directories where libraries can be found self.cpp_info.libdirs = ['lib', 'lib/release', 'lib/debug'] self.cpp_info.libs = tools.collect_libs(self) + + def package_id(self): + self.info.requires["ogre3d"].full_recipe_mode() diff --git a/ogre-caelum/all/conanfile.py b/ogre-caelum/all/conanfile.py index a01f624..5760572 100644 --- a/ogre-caelum/all/conanfile.py +++ b/ogre-caelum/all/conanfile.py @@ -34,3 +34,6 @@ class CaelumConan(ConanFile): 'include/Caelum' ] self.cpp_info.libs = tools.collect_libs(self) + + def package_id(self): + self.info.requires["ogre3d"].full_recipe_mode() diff --git a/ogre-pagedgeometry/all/conanfile.py b/ogre-pagedgeometry/all/conanfile.py index c9d001b..0ebe5cf 100644 --- a/ogre-pagedgeometry/all/conanfile.py +++ b/ogre-pagedgeometry/all/conanfile.py @@ -34,3 +34,6 @@ class CaelumConan(ConanFile): 'include/PagedGeometry' ] self.cpp_info.libs = tools.collect_libs(self) + + def package_id(self): + self.info.requires["ogre3d"].full_recipe_mode()