Restore CMake functionality

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

Author: darbyjohnston

CMakeLists.txt

@@ -28,6 +28,7 @@ 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_FIND_IMATH                "Find Imath using find_package" OFF)
@@ -148,6 +149,12 @@ 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,8 +29,16 @@ 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)
-    add_subdirectory(Imath)
+
+    # 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_ZLIB)

src/opentimelineio/OpenTimelineIOConfig.cmake.in

@@ -3,6 +3,6 @@
 include(CMakeFindDependencyMacro)
 find_dependency(OpenTime)
 find_dependency(Imath)
-find_dependency(minizip)
+find_dependency(zlib)
 
 include("${CMAKE_CURRENT_LIST_DIR}/OpenTimelineIOTargets.cmake")