Add zlib-ng submodule

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

Author: darbyjohnston

.gitmodules

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

src/deps/CMakeLists.txt

@@ -35,9 +35,11 @@ endif()
 
 if(NOT OTIO_FIND_MINIZIP_NG)
     set(BUILD_SHARED_LIBS OFF)
+    set(BUILD_TESTING OFF)
     set(CMAKE_POSITION_INDEPENDENT_CODE ON)
     set(MZ_COMPAT ON)
     set(MZ_ZLIB ON)
+    set(MZ_ZLIB_FLAVOR zlib-ng)
     set(MZ_BZIP2 OFF)
     set(MZ_LZMA OFF)
     set(MZ_ZSTD OFF)
@@ -47,13 +49,6 @@ if(NOT OTIO_FIND_MINIZIP_NG)
     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(zlib-ng)
     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()