Skip to content

Commit

Permalink
Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
laggykiller committed Sep 9, 2023
1 parent 142cdc5 commit ae821d0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class ApngasmRecipe(ConanFile):
def requirements(self):
self.requires("zlib/1.2.13")
self.requires("libpng/1.6.40")
self.requires("boost/1.82.0")
self.requires("boost/1.73.0")
self.generators = ['CMakeToolchain', 'CMakeDeps']

def build_requirements(self):
Expand Down
6 changes: 4 additions & 2 deletions get_deps.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ def install_deps(arch=None):
settings.append('compiler.libcxx=libc++')
elif platform.system() == 'Linux':
settings.append('os=Linux')
settings.append('compiler=gcc')
settings.append('compiler.version=10')
if arch:
settings.append(f'arch={arch}')

Expand All @@ -36,6 +34,10 @@ def install_deps(arch=None):
if platform.architecture()[0] == '32bit' or platform.machine().lower() not in (conan_archs['armv8'] + conan_archs['x86']):
build.append('cmake*')

print('conan cli settings:')
print(f'{settings = }')
print(f'{build = }')

subprocess.run(['conan', 'profile', 'detect'])

conan_output = os.path.join('conan_output', arch)
Expand Down

0 comments on commit ae821d0

Please sign in to comment.