Skip to content

Commit 8b60b0c

Browse files
Still trying to get libzip found (+ name fix)
1 parent f3e5bce commit 8b60b0c

File tree

2 files changed

+40
-5
lines changed

2 files changed

+40
-5
lines changed

.github/workflows/build_wheels.yml

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,39 @@ jobs:
150150
# output-dir: wheelhouse
151151
# config-file: "{package}/pyproject.toml"
152152

153-
- uses: actions/upload-artifact@v4
153+
- name: Upload Artifact (Python 3.9)
154+
uses: actions/upload-artifact@v4
155+
if: matrix.python_version == 'cp39-*'
154156
with:
155-
name: pyvcell-fv-${{ matrix.os }}-${{ matrix.python_version }}-cibw-wheels
157+
name: pyvcell-fv-${{ matrix.os }}-cp39-cibw-wheels
158+
path: ./wheelhouse/*.whl
159+
160+
- name: Upload Artifact (Python 3.10)
161+
uses: actions/upload-artifact@v4
162+
if: matrix.python_version == 'cp310-*'
163+
with:
164+
name: pyvcell-fv-${{ matrix.os }}-cp310-cibw-wheels
165+
path: ./wheelhouse/*.whl
166+
167+
- name: Upload Artifact (Python 3.11)
168+
uses: actions/upload-artifact@v4
169+
if: matrix.python_version == 'cp311-*'
170+
with:
171+
name: pyvcell-fv-${{ matrix.os }}-cp311-cibw-wheels
172+
path: ./wheelhouse/*.whl
173+
174+
- name: Upload Artifact (Python 3.12)
175+
uses: actions/upload-artifact@v4
176+
if: matrix.python_version == 'cp312-*'
177+
with:
178+
name: pyvcell-fv-${{ matrix.os }}-cp312-cibw-wheels
179+
path: ./wheelhouse/*.whl
180+
181+
- name: Upload Artifact (Python 3.13)
182+
uses: actions/upload-artifact@v4
183+
if: matrix.python_version == 'cp313-*'
184+
with:
185+
name: pyvcell-fv-${{ matrix.os }}-cp313-cibw-wheels
156186
path: ./wheelhouse/*.whl
157187

158188
- name: Setup tmate session on failure

CMakeLists.txt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,14 +132,19 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/libzippp/cmake/"
132132
include(GetGitRevisionDescription)
133133
git_describe(GIT_DESCRIBE ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR)
134134

135-
include (FindZLIB)
136-
include (FindLIBZIP)
137-
138135
# help CMake find libzip
139136
if (APPLE)
140137
execute_process(COMMAND brew --prefix libzip OUTPUT_VARIABLE LIBZIP_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
141138
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${LIBZIP_PREFIX})
142139
endif()
140+
if (LINUX)
141+
include_directories(/usr/local/include)
142+
link_directories(/usr/local/lib)
143+
endif ()
144+
145+
include (FindZLIB)
146+
include (FindLIBZIP)
147+
143148
find_package(LIBZIP 1.10 REQUIRED)
144149

145150

0 commit comments

Comments
 (0)