🐛 Fixed ogre pkg compatibility

This commit is contained in:
Edgar 2021-08-21 14:26:35 +00:00 committed by GitHub
parent 86fc043330
commit 1706c959b2
4 changed files with 15 additions and 3 deletions

View File

@ -1,10 +1,12 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import os, sys import os
import sys
import platform import platform
from glob import glob from glob import glob
import yaml import yaml
import subprocess import subprocess
def system(command): def system(command):
retcode = os.system(command) retcode = os.system(command)
if retcode != 0: if retcode != 0:
@ -34,7 +36,8 @@ for pkg in packages:
system(f"conan create {pkg} -s=build_type=Debug -k -b=outdated") 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: for d in data:
system(f"conan upload {d} -r ror-v2 --all --force") system(f"conan upload {d} -r ror-v2 --all --force")

View File

@ -40,3 +40,6 @@ class MyGUIConan(ConanFile):
# Directories where libraries can be found # Directories where libraries can be found
self.cpp_info.libdirs = ['lib', 'lib/release', 'lib/debug'] self.cpp_info.libdirs = ['lib', 'lib/release', 'lib/debug']
self.cpp_info.libs = tools.collect_libs(self) self.cpp_info.libs = tools.collect_libs(self)
def package_id(self):
self.info.requires["ogre3d"].full_recipe_mode()

View File

@ -34,3 +34,6 @@ class CaelumConan(ConanFile):
'include/Caelum' 'include/Caelum'
] ]
self.cpp_info.libs = tools.collect_libs(self) self.cpp_info.libs = tools.collect_libs(self)
def package_id(self):
self.info.requires["ogre3d"].full_recipe_mode()

View File

@ -34,3 +34,6 @@ class CaelumConan(ConanFile):
'include/PagedGeometry' 'include/PagedGeometry'
] ]
self.cpp_info.libs = tools.collect_libs(self) self.cpp_info.libs = tools.collect_libs(self)
def package_id(self):
self.info.requires["ogre3d"].full_recipe_mode()