add libzip to pip builds on manylinux, verify libzip in CMake

virtualcell · Jan 19, 2025 · 8987e6a · 8987e6a
1 parent da4f5cb
commit 8987e6a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml
@@ -139,7 +139,7 @@ jobs:
       run: |
         docker run --rm -v $(pwd):/io quay.io/pypa/manylinux2014_x86_64 \
            /bin/bash -c \
-           "yum install -y boost-devel hdf5-devel ninja-build && \
+           "yum install -y boost-devel hdf5-devel libzip-devel ninja-build && \
            /opt/python/cp39-cp39/bin/pip wheel /io/ -w /io/dist && \
            auditwheel repair /io/dist/*.whl -w /io/dist/"
         echo "keeping only the manylinux wheels, remove those with -linux_x86_64.whl in the name"
@@ -151,7 +151,7 @@ jobs:
       run: |
         docker run --rm -v $(pwd):/io quay.io/pypa/manylinux2014_x86_64 \
            /bin/bash -c \
-           "yum install -y boost-devel hdf5-devel ninja-build && \
+           "yum install -y boost-devel hdf5-devel libzip-devel ninja-build && \
            /opt/python/cp310-cp310/bin/pip wheel /io/ -w /io/dist && \
            auditwheel repair /io/dist/*.whl -w /io/dist/"
         echo "keeping only the manylinux wheels, remove those with -linux_x86_64.whl in the name"
@@ -163,7 +163,7 @@ jobs:
       run: |
         docker run --rm -v $(pwd):/io quay.io/pypa/manylinux2014_x86_64 \
            /bin/bash -c \
-           "yum install -y boost-devel hdf5-devel ninja-build && \
+           "yum install -y boost-devel hdf5-devel libzip-devel ninja-build && \
            /opt/python/cp311-cp311/bin/pip wheel /io/ -w /io/dist && \
            auditwheel repair /io/dist/*.whl -w /io/dist/"
         echo "keeping only the manylinux wheels, remove those with -linux_x86_64.whl in the name"
@@ -175,7 +175,7 @@ jobs:
       run: |
         docker run --rm -v $(pwd):/io quay.io/pypa/manylinux2014_x86_64 \
            /bin/bash -c \
-           "yum install -y boost-devel hdf5-devel ninja-build && \
+           "yum install -y boost-devel hdf5-devel libzip-devel ninja-build && \
            /opt/python/cp312-cp312/bin/pip wheel /io/ -w /io/dist && \
            auditwheel repair /io/dist/*.whl -w /io/dist/"
         echo "keeping only the manylinux wheels, remove those with -linux_x86_64.whl in the name"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -134,6 +134,13 @@ 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()
+find_package(LIBZIP REQUIRED)
+
 
 if (NOT OPTION_TARGET_PYTHON_BINDING)
 	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
@@ -192,6 +199,8 @@ endif()
 
 #CMakeList.txt that comes with hdf5 switches library name if compiled with debug
 if (APPLE)
+	execute_process(COMMAND brew --prefix libaec OUTPUT_VARIABLE LIBAEC_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
+	set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${LIBAEC_PREFIX})
 	find_package(libaec REQUIRED)
 endif()
 find_package(HDF5 COMPONENTS HL CXX C)