Skip to content

Commit

Permalink
Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
laggykiller committed Sep 10, 2023
1 parent 4644ae8 commit 97bff66
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions conanfile.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from conan import ConanFile
import shutil
import get_arch
from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
from conan.tools.cmake import CMake, CMakeToolchain, CMakeDeps, cmake_layout
from conan.tools.apple import is_apple_os

class ApngasmRecipe(ConanFile):
Expand All @@ -10,11 +10,10 @@ 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.generators = ['CMakeToolchain', 'CMakeDeps']
self.requires("boost/1.74.0")

def build_requirements(self):
self.build_requires("b2/[>4.10]")
self.build_requires("b2/4.5.0")
if not shutil.which('cmake'):
self.tool_requires("cmake/[>=3.27]")

Expand All @@ -23,6 +22,8 @@ def build(self):

def generate(self):
tc = CMakeToolchain(self)
cmake = CMakeDeps(self)
if is_apple_os(self) and get_arch == 'universal2':
tc.blocks['apple_system'].values['cmake_osx_architectures'] = 'x86_64; arm64'
tc.generate()
tc.generate()
cmake.generate()

0 comments on commit 97bff66

Please sign in to comment.