Skip to content

Commit 4df0dd4

Browse files
committed
Build fixes
Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com>
1 parent bb99e11 commit 4df0dd4

3 files changed

Lines changed: 9 additions & 2 deletions

File tree

.github/workflows/python-package.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@ jobs:
5151
if: matrix.os == env.GH_COV_OS && github.actor != env.GH_DEPENDABOT
5252
run: |
5353
sudo apt-get install lcov
54+
- name: Install ZLIB (Linux)
55+
if: runner.os == 'Linux'
56+
run: sudo apt-get install -y zlib1g-dev
57+
- name: Install ZLIB (Windows)
58+
if: runner.os == 'Windows'
59+
run: vcpkg install zlib:x64-windows
5460
- name: Build
5561
run: |
5662
cmake -E make_directory ${{ env.OTIO_BUILD_DIR }}

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ option(OTIO_INSTALL_COMMANDLINE_TOOLS "Install the OTIO command line tools" ON)
4040
option(OTIO_FIND_IMATH "Find Imath using find_package" OFF)
4141
option(OTIO_FIND_PYBIND11 "Find pybind11 using find_package" OFF)
4242
option(OTIO_FIND_RAPIDJSON "Find RapidJSON using find_package" OFF)
43-
# Note that minizip-ng also requires zlib or zlib-ng.
4443
option(OTIO_FIND_MINIZIP_NG "Find minizip-ng using find_package" OFF)
4544
set(OTIO_PYTHON_INSTALL_DIR "" CACHE STRING "Python installation dir (such as the site-packages dir)")
4645

@@ -289,6 +288,8 @@ if(OTIO_FIND_MINIZIP_NG)
289288
endif()
290289
else()
291290
message(STATUS "Using src/deps/minizip-ng by default")
291+
# Note that minizip-ng also requires zlib.
292+
find_package(ZLIB REQUIRED)
292293
endif()
293294

294295
# set up the internally hosted dependencies

src/deps/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ if(NOT OTIO_FIND_MINIZIP_NG)
7676
set(MZ_OPENSSL OFF)
7777
set(MZ_LIBBSD OFF)
7878
set(MZ_ICONV OFF)
79-
set(MZ_FETCH_LIBS ON)
79+
set(MZ_FETCH_LIBS OFF)
8080
set(SKIP_INSTALL_ALL ON)
8181
add_subdirectory(minizip-ng)
8282
endif()

0 commit comments

Comments
 (0)