Skip to content

Commit

Permalink
Revert the location of shared libraries (#883)
Browse files Browse the repository at this point in the history
- in the python build, shared libraries need to go along with the python
  libraries because of python security policies.
- Also removes an unnecsary reference to python cmake variables in the
  C++ only branch.

Co-authored-by: ssteinbach <[email protected]>
  • Loading branch information
ssteinbach and ssteinbach authored Feb 10, 2021
1 parent 22945fd commit 2a33b58
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,16 @@ if(OTIO_PYTHON_INSTALL)
# CMAKE_INSTALL_PREFIX was set, so install the python components there
set(OTIO_RESOLVED_PYTHON_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/python")
set(OTIO_RESOLVED_CXX_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
set(OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")

# In order to not require setting $PYTHONPATH to point at the .so,
# the shared libraries are installed into the python library
# location.
set(OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR "${OTIO_PYTHON_INSTALL_DIR}/opentimelineio")
message(INFO, "OTIO Defaulting Python install to ${OTIO_RESOLVED_PYTHON_INSTALL_DIR}")
message(INFO, "Note: C++ linkable-shared libraries can be found: ${OTIO_PYTHON_INSTALL_DIR}/opentimelineio")
endif()
endif()
else()
set(OTIO_RESOLVED_PYTHON_INSTALL_DIR "${OTIO_PYTHON_INSTALL_DIR}")
set(OTIO_RESOLVED_CXX_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
set(OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")
message(INFO, "OTIO C++ installing to ${CMAKE_INSTALL_PREFIX}")
Expand Down

0 comments on commit 2a33b58

Please sign in to comment.