Skip to content

Update OTIO version #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
darbyjohnston wants to merge 1 commit into from
Closed

Update OTIO version #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ find_package(OpenEXR)
find_package(minizip)
find_package(OpenColorIO)
find_package(OpenImageIO)
find_package(OTIO)
find_package(OpenTimelineIO)
find_package(OpenFX)
find_package(lunasvg)
find_package(dtk)
Expand All @@ -85,9 +85,6 @@ add_subdirectory(tests)
install(
FILES cmake/FindOpenFX.cmake
DESTINATION lib/cmake/toucan)
install(
FILES cmake/FindOTIO.cmake
DESTINATION lib/cmake/toucan)
include(CMakePackageConfigHelpers)
set(INCLUDE_INSTALL_DIR include/toucan)
configure_package_config_file(
Expand Down
2 changes: 1 addition & 1 deletion SuperBuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [ "$#" -eq 1 ]; then
BUILD_TYPE=$1
fi

cmake -S toucan/cmake/SuperBuild -B superbuild-$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=$PWD/install-$BUILD_TYPE -DCMAKE_PREFIX_PATH=$PWD/install-$BUILD_TYPE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
cmake -S toucan/cmake/SuperBuild -B superbuild-$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=$PWD/install-$BUILD_TYPE -DCMAKE_PREFIX_PATH=$PWD/install-$BUILD_TYPE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -Dtoucan_svt-av1=off
cmake --build superbuild-$BUILD_TYPE -j 4 --config $BUILD_TYPE

cmake -S toucan -B build-$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=$PWD/install-$BUILD_TYPE -DCMAKE_PREFIX_PATH=$PWD/install-$BUILD_TYPE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
Expand Down
64 changes: 0 additions & 64 deletions cmake/FindOTIO.cmake
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cmake/SuperBuild/BuildOpenTimelineIO.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include(ExternalProject)

set(OpenTimelineIO_GIT_REPOSITORY "https://github.com/AcademySoftwareFoundation/OpenTimelineIO.git")
set(OpenTimelineIO_GIT_TAG "v0.17.0")
set(OpenTimelineIO_GIT_TAG "c125d9c093871ec6b487b55db2392a9b9b00653a")

set(OpenTimelineIO_ARGS
${toucan_EXTERNAL_PROJECT_ARGS}
Expand Down
2 changes: 1 addition & 1 deletion lib/toucanRender/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ else()
endif()

add_library(toucanRender ${HEADERS} ${HEADERS_PRIVATE} ${SOURCE})
set(LIBS_PUBLIC dtk::dtkCore OTIO::opentimelineio OTIO::opentime OpenImageIO::OpenImageIO MINIZIP::minizip)
set(LIBS_PUBLIC dtk::dtkCore OTIO::opentimelineio OpenImageIO::OpenImageIO MINIZIP::minizip)
if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9)
list(APPEND LIBS_PUBLIC stdc++fs)
endif()
Expand Down