Still trying to get libzip found (+ name fix)

Author: CodeByDrescher

.github/workflows/build_wheels.yml

@@ -82,6 +82,7 @@ jobs:
           mingw-w64-clang-x86_64-boost \
           mingw-w64-clang-x86_64-hdf5 \
           mingw-w64-clang-x86_64-zlib \
+          mingw-w64-clang-x86_64-libzip \
           mingw-w64-clang-x86_64-libaec"
           echo "C:\tools\msys64\mingw64\bin" | Out-File -Append -Encoding ascii $env:GITHUB_PATH
           echo "C:\tools\msys64\clang64\bin" | Out-File -Append -Encoding ascii $env:GITHUB_PATH
@@ -110,6 +111,7 @@ jobs:
           CIBW_BUILD: ${{ matrix.python_version }}
           CIBW_ENVIRONMENT: >
             FC=/usr/local/bin/gfortran
+            MACOSX_DEPLOYMENT_TARGET="10.13"
         # with:
         #   package-dir: .
         #   output-dir: wheelhouse
@@ -133,7 +135,9 @@ jobs:
         if: matrix.os == 'ubuntu-24.04-arm'
         env:
           CIBW_BUILD: ${{ matrix.python_version }}
-          CIBW_BEFORE_BUILD: "pip install h5py && export LIBZIP_INCLUDE_DIR=/usr/local/include && export LIBZIP_LIBRARY=/usr/local/lib/libzip.so"
+          CIBW_MANYLINUX_*_IMAGE: "manylinux_2_34"
+          CIBW_REPAIR_WHEEL_COMMAND: 'auditwheel repair --disable-isa-ext-check {wheel} -w {dest_dir}'
+          CIBW_BEFORE_BUILD: "yum install -y boost-devel hdf5-devel libzip-devel bzip2-devel ninja-build openssl-devel xz-devel && pip install h5py"
         # with:
         #   package-dir: .
         #   output-dir: wheelhouse
@@ -144,15 +148,52 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
         env:
           CIBW_BUILD: ${{ matrix.python_version }}
-          CIBW_BEFORE_BUILD:  "pip install h5py && export LIBZIP_INCLUDE_DIR=/usr/local/include && export LIBZIP_LIBRARY=/usr/local/lib/libzip.so"
+          CIBW_MANYLINUX_*_IMAGE: 'manylinux_2_34'
+          CIBW_REPAIR_WHEEL_COMMAND: 'auditwheel repair --disable-isa-ext-check {wheel} -w {dest_dir}'
+          CIBW_BEFORE_BUILD:  "yum install -y boost-devel hdf5-devel libzip-devel bzip2-devel ninja-build openssl-devel xz-devel && pip install h5py \
+            "
         # with:
         #   package-dir: .
         #   output-dir: wheelhouse
         #   config-file: "{package}/pyproject.toml"
+#        && mkdir /libzip_source \
+#        &&
+#        && export LIBZIP_INCLUDE_DIR=/usr/local/include \
+#        && export LIBZIP_LIBRARY=/usr/local/lib/libzip.so
 
-      - uses: actions/upload-artifact@v4
+      - name: Upload Artifact (Python 3.9)
+        uses: actions/upload-artifact@v4
+        if: matrix.python_version == 'cp39-*'
         with:
-          name: pyvcell-fv-${{ matrix.os }}-${{ matrix.python_version }}-cibw-wheels
+          name: pyvcell-fv-${{ matrix.os }}-cp39-cibw-wheels
+          path: ./wheelhouse/*.whl
+
+      - name: Upload Artifact (Python 3.10)
+        uses: actions/upload-artifact@v4
+        if: matrix.python_version == 'cp310-*'
+        with:
+          name: pyvcell-fv-${{ matrix.os }}-cp310-cibw-wheels
+          path: ./wheelhouse/*.whl
+
+      - name: Upload Artifact (Python 3.11)
+        uses: actions/upload-artifact@v4
+        if: matrix.python_version == 'cp311-*'
+        with:
+          name: pyvcell-fv-${{ matrix.os }}-cp311-cibw-wheels
+          path: ./wheelhouse/*.whl
+
+      - name: Upload Artifact (Python 3.12)
+        uses: actions/upload-artifact@v4
+        if: matrix.python_version == 'cp312-*'
+        with:
+          name: pyvcell-fv-${{ matrix.os }}-cp312-cibw-wheels
+          path: ./wheelhouse/*.whl
+
+      - name: Upload Artifact (Python 3.13)
+        uses: actions/upload-artifact@v4
+        if: matrix.python_version == 'cp313-*'
+        with:
+          name: pyvcell-fv-${{ matrix.os }}-cp313-cibw-wheels
           path: ./wheelhouse/*.whl
 
       - name: Setup tmate session on failure

CMakeLists.txt

@@ -132,14 +132,15 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/libzippp/cmake/"
 include(GetGitRevisionDescription)
 git_describe(GIT_DESCRIBE ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR)
 
-include (FindZLIB)
-include (FindLIBZIP)
-
 # help CMake find libzip
 if (APPLE)
 	execute_process(COMMAND brew --prefix libzip OUTPUT_VARIABLE LIBZIP_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
 	set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${LIBZIP_PREFIX})
 endif()
+
+include (FindZLIB)
+include (FindLIBZIP)
+
 find_package(LIBZIP 1.10 REQUIRED)