File tree Expand file tree Collapse file tree 2 files changed +3
-14
lines changed
Expand file tree Collapse file tree 2 files changed +3
-14
lines changed Original file line number Diff line number Diff line change @@ -32,8 +32,7 @@ option(OTIO_DEPENDENCIES_INSTALL "Install OTIO's C++ header dependencies (I
3232option (OTIO_INSTALL_PYTHON_MODULES "Install OTIO pure Python modules/files" ON )
3333option (OTIO_INSTALL_COMMANDLINE_TOOLS "Install the OTIO command line tools" ON )
3434option (OTIO_INSTALL_CONTRIB "Install the opentimelineio_contrib Python package" ON )
35- set (OTIO_IMATH_LIBS "" CACHE STRING "Imath library overrides to use instead of src/deps or find_package" )
36- option (OTIO_FIND_IMATH "Find Imath using find_package, ignored if OTIO_IMATH_LIBS is set" OFF )
35+ option (OTIO_FIND_IMATH "Find Imath using find_package" OFF )
3736option (OTIO_FIND_RAPIDJSON "Find RapidJSON using find_package" OFF )
3837set (OTIO_PYTHON_INSTALL_DIR "" CACHE STRING "Python installation dir (such as the site-packages dir)" )
3938
@@ -243,23 +242,13 @@ set(CTEST_OUTPUT_ON_FAILURE ON)
243242# Build the dependencies and components
244243
245244#----- Imath
246- set (OTIO_RESOLVED_IMATH_LIBRARIES "" )
247- if (NOT "${OTIO_IMATH_LIBS} " STREQUAL "" )
248- message (STATUS "Using Imath from OTIO_MATH_LIBS: ${OTIO_IMATH_LIBS} " )
249- set (OTIO_RESOLVED_IMATH_LIBRARIES "${OTIO_IMATH_LIBS} " )
250- set (USE_DEPS_IMATH OFF )
251- elseif (OTIO_FIND_IMATH)
252- set (USE_DEPS_IMATH OFF )
245+ if (OTIO_FIND_IMATH)
253246 find_package (Imath REQUIRED)
254247 if (Imath_FOUND)
255248 message (STATUS "Found Imath 3 at ${Imath_CONFIG} " )
256249 endif ()
257250else ()
258251 message (STATUS "Using src/deps/Imath by default" )
259- set (USE_DEPS_IMATH ON )
260- endif ()
261-
262- if (USE_DEPS_IMATH)
263252 include_directories ("${PROJECT_SOURCE_DIR} /src/deps/Imath/src" )
264253endif ()
265254
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ if(OTIO_PYTHON_INSTALL)
2525 add_subdirectory (pybind11)
2626endif ()
2727
28- if (USE_DEPS_IMATH )
28+ if ( NOT OTIO_FIND_IMATH )
2929 # preserve BUILD_SHARED_LIBS options for this project, but set it off for Imath
3030 option (BUILD_SHARED_LIBS "Build shared libraries" ON )
3131 set (BUILD_SHARED_LIBS OFF )
You can’t perform that action at this time.
0 commit comments