Refactoring

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

Author: darbyjohnston

CMakeLists.txt

@@ -33,7 +33,10 @@ option(OTIO_INSTALL_PYTHON_MODULES    "Install OTIO pure Python modules/files" O
 option(OTIO_INSTALL_COMMANDLINE_TOOLS "Install the OTIO command line tools" ON)
 option(OTIO_FIND_IMATH                "Find Imath using find_package" OFF)
 option(OTIO_FIND_RAPIDJSON            "Find RapidJSON using find_package" OFF)
-option(OTIO_FIND_ZLIB                 "Find zlib using find_package" OFF)
+option(OTIO_FIND_BUNDLE_LIBS          "Find minizip and zlib using find_package" OFF)
+set(OTIO_BUNDLE_LIBS
+    MINIZIP::minizipstatic ZLIB::ZLIBSTATIC
+    CACHE STRING "Bundle libraries to link against (minizip and zlib)")
 set(OTIO_PYTHON_INSTALL_DIR "" CACHE STRING "Python installation dir (such as the site-packages dir)")
 
 # Build options
@@ -264,8 +267,8 @@ else()
     message(STATUS "Using src/deps/rapidjson by default")
 endif()
 
-#----- zlib and minizip
-if(OTIO_FIND_ZLIB)
+#----- minizip and zlib
+if(OTIO_FIND_BUNDLE_LIBS)
     find_package(ZLIB CONFIG REQUIRED)
     find_package(minizip CONFIG REQUIRED)
     if (ZLIB_FOUND)

src/deps/CMakeLists.txt

@@ -9,7 +9,7 @@ set(DEPS_SUBMODULES pybind11)
 if(NOT OTIO_FIND_RAPIDJSON)
     set(DEPS_SUBMODULES ${DEPS_SUBMODULES} rapidjson)
 endif()
-if(NOT OTIO_FIND_ZLIB)
+if(NOT OTIO_FIND_BUNDLE_LIBS)
     set(DEPS_SUBMODULES ${DEPS_SUBMODULES} zlib)
 endif()
 
@@ -41,7 +41,7 @@ if(NOT OTIO_FIND_IMATH)
     endif()
 endif()
 
-if(NOT OTIO_FIND_ZLIB)
+if(NOT OTIO_FIND_BUNDLE_LIBS)
     set(BUILD_SHARED_LIBS OFF)
     set(BUILD_TESTING OFF)
     set(CMAKE_POSITION_INDEPENDENT_CODE ON)

src/opentimelineio/CMakeLists.txt

@@ -107,7 +107,7 @@ endif()
 
 target_link_libraries(opentimelineio 
     PUBLIC opentime Imath::Imath
-    PRIVATE MINIZIP::minizipstatic ZLIB::ZLIBSTATIC)
+    PRIVATE ${OTIO_BUNDLE_LIBS})
 
 set_target_properties(opentimelineio PROPERTIES
     DEBUG_POSTFIX "${OTIO_DEBUG_POSTFIX}"