bing in libzip as submodule for source build on all platforms

virtualcell · Jan 19, 2025 · 9cbbe0a · 9cbbe0a
1 parent 9116ed6
commit 9cbbe0a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 58 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -72,7 +72,6 @@ jobs:
         run: |
           brew install boost
           brew install hdf5
-          brew install libzip
           brew install ninja
           brew install libaec
 
@@ -93,7 +92,6 @@ jobs:
         run: |
           brew install boost
           brew install hdf5
-          brew install libzip
           brew install ninja
           brew install libaec
 
@@ -200,7 +198,6 @@ jobs:
             mingw-w64-clang-x86_64-cmake
             mingw-w64-clang-x86_64-boost
             mingw-w64-clang-x86_64-hdf5
-            mingw-w64-clang-x86_64-libzip
             mingw-w64-clang-x86_64-zlib
             mingw-w64-clang-x86_64-libaec
 
@@ -256,7 +253,7 @@ jobs:
         if: matrix.platform == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libboost-all-dev libhdf5-dev libzip-dev libbz2-dev ninja-build
+          sudo apt-get install -y libboost-all-dev libhdf5-dev libbz2-dev ninja-build
 
           gcc --version
           gfortran --version

diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml
@@ -37,7 +37,6 @@ jobs:
       run: |
         brew install boost
         brew install hdf5
-        brew install libzip
         brew install ninja
         brew install libaec
         
@@ -59,7 +58,6 @@ jobs:
       run: |
         brew install boost
         brew install hdf5
-        brew install libzip
         brew install ninja
         brew install libaec
         
@@ -89,7 +87,6 @@ jobs:
           mingw-w64-clang-x86_64-cmake
           mingw-w64-clang-x86_64-boost
           mingw-w64-clang-x86_64-hdf5
-          mingw-w64-clang-x86_64-libzip
           mingw-w64-clang-x86_64-zlib
           mingw-w64-clang-x86_64-libaec
           mingw-w64-clang-x86_64-python-pip-tools
@@ -140,16 +137,6 @@ jobs:
         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 update -y curl && \
-           cd /tmp && \
-           curl -LO https://libzip.org/download/libzip-1.10.1.tar.gz && \
-           tar -xzf libzip-1.10.1.tar.gz && \
-           cd libzip-1.10.1 && \
-           mkdir build && \
-           cd build && \
-           cmake .. && \
-           make && \
-           make install && \
            /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"
@@ -162,16 +149,6 @@ jobs:
         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 update -y curl && \
-           cd /tmp && \
-           curl -LO https://libzip.org/download/libzip-1.10.1.tar.gz && \
-           tar -xzf libzip-1.10.1.tar.gz && \
-           cd libzip-1.10.1 && \
-           mkdir build && \
-           cd build && \
-           cmake .. && \
-           make && \
-           make install && \
            /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"
@@ -184,16 +161,6 @@ jobs:
         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 update -y curl && \
-           cd /tmp && \
-           curl -LO https://libzip.org/download/libzip-1.10.1.tar.gz && \
-           tar -xzf libzip-1.10.1.tar.gz && \
-           cd libzip-1.10.1 && \
-           mkdir build && \
-           cd build && \
-           cmake .. && \
-           make && \
-           make install && \
            /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"
@@ -206,16 +173,6 @@ jobs:
         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 update -y curl && \
-           cd /tmp && \
-           curl -LO https://libzip.org/download/libzip-1.10.1.tar.gz && \
-           tar -xzf libzip-1.10.1.tar.gz && \
-           cd libzip-1.10.1 && \
-           mkdir build && \
-           cd build && \
-           cmake .. && \
-           make && \
-           make install && \
            /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
@@ -132,15 +132,6 @@ 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()
-find_package(LIBZIP 1.10 REQUIRED)
-
 
 if (NOT OPTION_TARGET_PYTHON_BINDING)
 	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
@@ -216,8 +207,7 @@ add_subdirectory(VCellMessaging)
 
 add_subdirectory(VCellZipUtils)
 
-
-
+add_subdirectory(libzip)
 
 add_subdirectory(libzippp)
 # Path to the patch file