diff --git a/conanfile.py b/conanfile.py index 1db059c..2525289 100644 --- a/conanfile.py +++ b/conanfile.py @@ -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): diff --git a/get_deps.py b/get_deps.py index 270c40f..dae04c6 100755 --- a/get_deps.py +++ b/get_deps.py @@ -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}') @@ -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)