Fix build using no toolchain method

laggykiller · Sep 9, 2023 · adc0f96 · adc0f96
1 parent e52d56d
commit adc0f96
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 13 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -45,18 +45,28 @@ jobs:
               MACOSX_DEPLOYMENT_TARGET=11.0
           - os: ubuntu-20.04
             cibw_archs_linux: x86_64
+            cibw_skip: "*-manylinux_*"
             cibw_environment: APNGASM_COMPILE_TARGET=x86_64
+          - os: ubuntu-20.04
+            cibw_archs_linux: x86_64
+            cibw_skip: "*-muslinux_*"
+            cibw_environment: APNGASM_COMPILE_TARGET=x86_64
+          - os: ubuntu-20.04
+            cibw_archs_linux: i686
+            cibw_skip: "*-manylinux_*"
+            cibw_environment: APNGASM_COMPILE_TARGET=x86
           - os: ubuntu-20.04
             cibw_archs_linux: i686
+            cibw_skip: "*-muslinux_*"
             cibw_environment: APNGASM_COMPILE_TARGET=x86
           - os: ubuntu-20.04
             cibw_archs_linux: aarch64
-            cibw_skip: "*-muslinux_* pp*"
+            cibw_skip: "*-manylinux_*"
+            cibw_environment: APNGASM_COMPILE_TARGET=armv8
+          - os: ubuntu-20.04
+            cibw_archs_linux: aarch64
+            cibw_skip: "*-musllinux_*"
             cibw_environment: APNGASM_COMPILE_TARGET=armv8
-          # - os: ubuntu-20.04
-          #   cibw_archs_linux: aarch64
-          #   cibw_skip: "*-multilinux_* pp*"
-          #   cibw_environment: APNGASM_COMPILE_TARGET=armv8
           # - os: ubuntu-20.04
           #   cibw_archs_linux: aarch64
           #   cibw_skip: "*-muslinux_* *-multilinux_*"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -45,14 +45,22 @@ if (WIN32)
 endif()
 
 # Add conan packages
-set(CONAN_ROOT ${CMAKE_SOURCE_DIR}/conan_output/${APNGASM_COMPILE_TARGET}/direct_deploy)
-
-set(ZLIB_ROOT ${CONAN_ROOT}/zlib)
-set(PNG_ROOT ${CONAN_ROOT}/libpng)
-set(Boost_ROOT ${CONAN_ROOT}/boost)
-include_directories(${ZLIB_ROOT}/include)
-include_directories(${PNG_ROOT}/include)
-include_directories(${Boost_ROOT}/include)
+if (${APNGASM_COMPILE_TARGET} STREQUAL "universal2")
+    set(CONAN_ROOT ${CMAKE_SOURCE_DIR}/conan_output/universal2/direct_deploy)
+    set(ZLIB_ROOT ${CONAN_ROOT}/zlib)
+    set(PNG_ROOT ${CONAN_ROOT}/libpng)
+    set(Boost_ROOT ${CONAN_ROOT}/boost)
+    include_directories(${ZLIB_ROOT}/include)
+    include_directories(${PNG_ROOT}/include)
+    include_directories(${Boost_ROOT}/include)
+else()
+    set(CONAN_TOOLCHAIN ${CMAKE_SOURCE_DIR}/conan_output/${APNGASM_COMPILE_TARGET}/conan_toolchain.cmake)
+    if (EXISTS ${CONAN_TOOLCHAIN})
+        include(${CONAN_TOOLCHAIN})
+    else()
+        message(WARNING "The conan_toolchain file could not be found: ${CONAN_TOOLCHAIN}")
+    endif()
+endif()
 
 project(apngasm-python VERSION 1.0.6)
 set(PY_VERSION_SUFFIX "")