Skip to content

Commit 9cbbe0a

Browse files
jcschaffjcschaff
committed
bing in libzip as submodule for source build on all platforms
1 parent 9116ed6 commit 9cbbe0a

File tree

3 files changed

+2
-58
lines changed

3 files changed

+2
-58
lines changed

‎.github/workflows/cd.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ jobs:
7272
run: |
7373
brew install boost
7474
brew install hdf5
75-
brew install libzip
7675
brew install ninja
7776
brew install libaec
7877
@@ -93,7 +92,6 @@ jobs:
9392
run: |
9493
brew install boost
9594
brew install hdf5
96-
brew install libzip
9795
brew install ninja
9896
brew install libaec
9997
@@ -200,7 +198,6 @@ jobs:
200198
mingw-w64-clang-x86_64-cmake
201199
mingw-w64-clang-x86_64-boost
202200
mingw-w64-clang-x86_64-hdf5
203-
mingw-w64-clang-x86_64-libzip
204201
mingw-w64-clang-x86_64-zlib
205202
mingw-w64-clang-x86_64-libaec
206203
@@ -256,7 +253,7 @@ jobs:
256253
if: matrix.platform == 'ubuntu-latest'
257254
run: |
258255
sudo apt-get update
259-
sudo apt-get install -y libboost-all-dev libhdf5-dev libzip-dev libbz2-dev ninja-build
256+
sudo apt-get install -y libboost-all-dev libhdf5-dev libbz2-dev ninja-build
260257
261258
gcc --version
262259
gfortran --version

‎.github/workflows/pip.yml‎

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ jobs:
3737
run: |
3838
brew install boost
3939
brew install hdf5
40-
brew install libzip
4140
brew install ninja
4241
brew install libaec
4342
@@ -59,7 +58,6 @@ jobs:
5958
run: |
6059
brew install boost
6160
brew install hdf5
62-
brew install libzip
6361
brew install ninja
6462
brew install libaec
6563
@@ -89,7 +87,6 @@ jobs:
8987
mingw-w64-clang-x86_64-cmake
9088
mingw-w64-clang-x86_64-boost
9189
mingw-w64-clang-x86_64-hdf5
92-
mingw-w64-clang-x86_64-libzip
9390
mingw-w64-clang-x86_64-zlib
9491
mingw-w64-clang-x86_64-libaec
9592
mingw-w64-clang-x86_64-python-pip-tools
@@ -140,16 +137,6 @@ jobs:
140137
docker run --rm -v $(pwd):/io quay.io/pypa/manylinux2014_x86_64 \
141138
/bin/bash -c \
142139
"yum install -y boost-devel hdf5-devel ninja-build && \
143-
yum update -y curl && \
144-
cd /tmp && \
145-
curl -LO https://libzip.org/download/libzip-1.10.1.tar.gz && \
146-
tar -xzf libzip-1.10.1.tar.gz && \
147-
cd libzip-1.10.1 && \
148-
mkdir build && \
149-
cd build && \
150-
cmake .. && \
151-
make && \
152-
make install && \
153140
/opt/python/cp39-cp39/bin/pip wheel /io/ -w /io/dist && \
154141
auditwheel repair /io/dist/*.whl -w /io/dist/"
155142
echo "keeping only the manylinux wheels, remove those with -linux_x86_64.whl in the name"
@@ -162,16 +149,6 @@ jobs:
162149
docker run --rm -v $(pwd):/io quay.io/pypa/manylinux2014_x86_64 \
163150
/bin/bash -c \
164151
"yum install -y boost-devel hdf5-devel ninja-build && \
165-
yum update -y curl && \
166-
cd /tmp && \
167-
curl -LO https://libzip.org/download/libzip-1.10.1.tar.gz && \
168-
tar -xzf libzip-1.10.1.tar.gz && \
169-
cd libzip-1.10.1 && \
170-
mkdir build && \
171-
cd build && \
172-
cmake .. && \
173-
make && \
174-
make install && \
175152
/opt/python/cp310-cp310/bin/pip wheel /io/ -w /io/dist && \
176153
auditwheel repair /io/dist/*.whl -w /io/dist/"
177154
echo "keeping only the manylinux wheels, remove those with -linux_x86_64.whl in the name"
@@ -184,16 +161,6 @@ jobs:
184161
docker run --rm -v $(pwd):/io quay.io/pypa/manylinux2014_x86_64 \
185162
/bin/bash -c \
186163
"yum install -y boost-devel hdf5-devel ninja-build && \
187-
yum update -y curl && \
188-
cd /tmp && \
189-
curl -LO https://libzip.org/download/libzip-1.10.1.tar.gz && \
190-
tar -xzf libzip-1.10.1.tar.gz && \
191-
cd libzip-1.10.1 && \
192-
mkdir build && \
193-
cd build && \
194-
cmake .. && \
195-
make && \
196-
make install && \
197164
/opt/python/cp311-cp311/bin/pip wheel /io/ -w /io/dist && \
198165
auditwheel repair /io/dist/*.whl -w /io/dist/"
199166
echo "keeping only the manylinux wheels, remove those with -linux_x86_64.whl in the name"
@@ -206,16 +173,6 @@ jobs:
206173
docker run --rm -v $(pwd):/io quay.io/pypa/manylinux2014_x86_64 \
207174
/bin/bash -c \
208175
"yum install -y boost-devel hdf5-devel ninja-build && \
209-
yum update -y curl && \
210-
cd /tmp && \
211-
curl -LO https://libzip.org/download/libzip-1.10.1.tar.gz && \
212-
tar -xzf libzip-1.10.1.tar.gz && \
213-
cd libzip-1.10.1 && \
214-
mkdir build && \
215-
cd build && \
216-
cmake .. && \
217-
make && \
218-
make install && \
219176
/opt/python/cp312-cp312/bin/pip wheel /io/ -w /io/dist && \
220177
auditwheel repair /io/dist/*.whl -w /io/dist/"
221178
echo "keeping only the manylinux wheels, remove those with -linux_x86_64.whl in the name"

‎CMakeLists.txt‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,6 @@ include(GetGitRevisionDescription)
132132
git_describe(GIT_DESCRIBE ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR)
133133

134134
include (FindZLIB)
135-
include (FindLIBZIP)
136-
137-
# help CMake find libzip
138-
if (APPLE)
139-
execute_process(COMMAND brew --prefix libzip OUTPUT_VARIABLE LIBZIP_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
140-
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${LIBZIP_PREFIX})
141-
endif()
142-
find_package(LIBZIP 1.10 REQUIRED)
143-
144135

145136
if (NOT OPTION_TARGET_PYTHON_BINDING)
146137
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
@@ -216,8 +207,7 @@ add_subdirectory(VCellMessaging)
216207

217208
add_subdirectory(VCellZipUtils)
218209

219-
220-
210+
add_subdirectory(libzip)
221211

222212
add_subdirectory(libzippp)
223213
# Path to the patch file

0 commit comments

Comments
 (0)