Add a workaround for finding zlibng, and try shared libraries

Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com>

Author: darbyjohnston

CMakeLists.txt

@@ -28,7 +28,6 @@ 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)
@@ -149,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()

src/deps/CMakeLists.txt

@@ -29,20 +29,10 @@ 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()
+    add_subdirectory(Imath)
 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)
@@ -55,5 +45,13 @@ 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(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/zlibng-config.cmake

@@ -0,0 +1,4 @@
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+set(ZLIBNG_INCLUDE_DIRS "${_IMPORT_PREFIX}/include")
+set(ZLIBNG_LIBRARIES "z-ng")
+set(ZLIBNG_LIBRARY_DIRS "${_IMPORT_PREFIX}/lib")