Add minizip-ng dependency

Signed-off-by: Darby Johnston <[email protected]>

Author: darbyjohnston

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "src/deps/Imath"]
 	path = src/deps/Imath
 	url = https://github.com/AcademySoftwareFoundation/Imath
+[submodule "src/deps/minizip-ng"]
+	path = src/deps/minizip-ng
+	url = https://github.com/zlib-ng/minizip-ng.git

CMakeLists.txt

@@ -28,12 +28,12 @@ project(OpenTimelineIO VERSION ${OTIO_VERSION} LANGUAGES C CXX)
 # Installation options
 option(OTIO_CXX_INSTALL               "Install the C++ bindings" ON)
 option(OTIO_PYTHON_INSTALL            "Install the Python bindings" OFF)
-option(OTIO_DEPENDENCIES_INSTALL      "Install OTIO's C++ header dependencies (Imath)" ON)
 option(OTIO_INSTALL_PYTHON_MODULES    "Install OTIO pure Python modules/files" ON)
 option(OTIO_INSTALL_COMMANDLINE_TOOLS "Install the OTIO command line tools" ON)
 option(OTIO_INSTALL_CONTRIB           "Install the opentimelineio_contrib Python package" ON)
 option(OTIO_FIND_IMATH                "Find Imath using find_package" OFF)
 option(OTIO_FIND_RAPIDJSON            "Find RapidJSON using find_package" OFF)
+option(OTIO_FIND_MINIZIP_NG           "Find minizip-ng using find_package" OFF)
 set(OTIO_PYTHON_INSTALL_DIR "" CACHE STRING "Python installation dir (such as the site-packages dir)")
 
 # Build options
@@ -148,12 +148,6 @@ set(OTIO_RESOLVED_CXX_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
 if(OTIO_CXX_INSTALL)
     message(STATUS "Installing C++ bindings to: ${OTIO_RESOLVED_CXX_INSTALL_DIR}")
     message(STATUS "Installing C++ dynamic libraries to: ${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}")
-
-    if(OTIO_DEPENDENCIES_INSTALL)
-        message(STATUS "  Installing header dependencies for C++ (OTIO_DEPENDENCIES_INSTALL=ON)")
-    else()
-        message(STATUS "  Not installing header dependencies for C++ (OTIO_DEPENDENCIES_INSTALL=OFF)")
-    endif()
 else()
     message(STATUS "Install C++ bindings: OFF")
 endif()
@@ -263,6 +257,16 @@ else()
     message(STATUS "Using src/deps/rapidjson by default")
 endif()
 
+#----- minizip-ng
+if(OTIO_FIND_MINIZIP_NG)
+    find_package(minizip-ng CONFIG REQUIRED)
+    if (minizip-ng_FOUND)
+        message(STATUS "Found minizip-ng at ${minizip-ng_CONFIG}")
+    endif()
+else()
+    message(STATUS "Using src/deps/minizip-ng by default")
+endif()
+
 # set up the internally hosted dependencies
 add_subdirectory(src/deps)
 

src/deps/CMakeLists.txt

@@ -9,6 +9,9 @@ set(DEPS_SUBMODULES pybind11)
 if(NOT OTIO_FIND_RAPIDJSON)
     set(DEPS_SUBMODULES ${DEPS_SUBMODULES} rapidjson)
 endif()
+if(NOT OTIO_FIND_MINIZIP_NG)
+    set(DEPS_SUBMODULES ${DEPS_SUBMODULES} minizip-ng)
+endif()
 
 foreach(submodule IN LISTS DEPS_SUBMODULES)
     file(GLOB SUBMOD_CONTENTS ${submodule})
@@ -26,15 +29,30 @@ if(OTIO_PYTHON_INSTALL)
 endif()
 
 if(NOT OTIO_FIND_IMATH)
-    # preserve BUILD_SHARED_LIBS options for this project, but set it off for Imath
-    option(BUILD_SHARED_LIBS "Build shared libraries" ON)
     set(BUILD_SHARED_LIBS OFF)
-
-    # If we do not want Imath to install headers and CMake files use the EXCLUDE_FROM_ALL option
-    if(OTIO_CXX_INSTALL AND OTIO_DEPENDENCIES_INSTALL)
-        add_subdirectory(Imath)
-    else()
-        add_subdirectory(Imath EXCLUDE_FROM_ALL)
-    endif()
 endif()
 
+if(NOT OTIO_FIND_MINIZIP_NG)
+    set(BUILD_SHARED_LIBS OFF)
+    set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+    set(MZ_COMPAT ON)
+    set(MZ_ZLIB ON)
+    set(MZ_BZIP2 OFF)
+    set(MZ_LZMA OFF)
+    set(MZ_ZSTD OFF)
+    set(MZ_LIBCOMP OFF)
+    set(MZ_PKCRYPT OFF)
+    set(MZ_WZAES OFF)
+    set(MZ_OPENSSL OFF)
+    set(MZ_LIBBSD OFF)
+    set(MZ_ICONV OFF)
+    set(MZ_FETCH_LIBS ON)
+    set(MZ_FORCE_FETCH_LIBS ON)
+    add_subdirectory(minizip-ng)
+
+    # TODO This is a temporary workaround to find zlib-ng. For some reason
+    # zlib-ng is not installing it's own CMake configuration files when built
+    # by minizip-ng.
+    install(FILES zlibng-config.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/cmake/zlibng)
+
+endif()

src/deps/minizip-ng

@@ -92,7 +92,8 @@ endif()
 
 
 target_link_libraries(opentimelineio 
-    PUBLIC opentime Imath::Imath)
+    PUBLIC opentime Imath::Imath
+    PRIVATE MINIZIP::minizip)
 
 set_target_properties(opentimelineio PROPERTIES
     DEBUG_POSTFIX "${OTIO_DEBUG_POSTFIX}"