diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 6d2313d..6216c25 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -112,7 +112,8 @@ jobs: CIBW_ARCHS_MACOS: ${{ matrix.cibw_archs_macos }} CIBW_ARCHS_LINUX: ${{ matrix.cibw_archs_linux }} CIBW_BEFORE_ALL: ${{ matrix.cibw_before_all }} - CIBW_ENVIRONMENT: PY_BUILD_CMAKE_VERBOSE=1 ${{ matrix.cibw_environment }} + # CIBW_ENVIRONMENT: PY_BUILD_CMAKE_VERBOSE=1 ${{ matrix.cibw_environment }} + CIBW_ENVIRONMENT: ${{ matrix.cibw_environment }} CIBW_SKIP: cp36* cp37* pp37* ${{ matrix.cibw_skip }} - uses: actions/upload-artifact@v3 diff --git a/conanfile.py b/conanfile.py index 05a4745..1db059c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -12,7 +12,6 @@ def requirements(self): def build_requirements(self): # https://stackoverflow.com/questions/42123509/cmake-finds-boost-but-the-imported-targets-not-available-for-boost-version self.tool_requires("cmake/[>=3.27]") - self.tool_requires("b2/[>=4.10]") def build(self): build_type = 'Release' \ No newline at end of file diff --git a/get_deps.py b/get_deps.py index 924c3ae..18ae5ac 100755 --- a/get_deps.py +++ b/get_deps.py @@ -3,6 +3,7 @@ import os import subprocess import platform +import shutil from get_arch import conan_archs, get_arch def install_deps(arch=None): @@ -21,7 +22,8 @@ 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}') @@ -30,7 +32,6 @@ def install_deps(arch=None): # Need to compile dependencies if musllinux build.append('zlib*') build.append('libpng*') - build.append('b2*') build.append('boost*') if platform.architecture()[0] == '32bit' and platform.machine().lower() in (conan_archs['x86_64'] + conan_archs['x86']): build.append('cmake*') @@ -58,7 +59,8 @@ def main(): # Repeat to install the other architecture version of libwebp conan_output_x64 = install_deps('x86_64') conan_output_universal2 = 'conan_output/universal2' - os.makedirs(conan_output_universal2, exist_ok=True) + shutil.rmtree(conan_output_universal2, ignore_errors=True) + os.makedirs(conan_output_universal2) subprocess.run([ 'python3', 'lipo-dir-merge/lipo-dir-merge.py', conan_output, conan_output_x64, conan_output_universal2