Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ set(TOUCAN_PLUGINS
enable_testing()

find_package(ZLIB)
find_package(minizip)
find_package(minizip-ng)
find_package(Imath)
find_package(PNG)
find_package(JPEG)
Expand Down
24 changes: 12 additions & 12 deletions cmake/Package.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,22 @@ elseif(APPLE)
#set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

set(INSTALL_DYLIBS
${CMAKE_INSTALL_PREFIX}/lib/libavcodec.62.11.100.dylib
${CMAKE_INSTALL_PREFIX}/lib/libavcodec.62.28.102.dylib
${CMAKE_INSTALL_PREFIX}/lib/libavcodec.62.dylib
${CMAKE_INSTALL_PREFIX}/lib/libavcodec.dylib
${CMAKE_INSTALL_PREFIX}/lib/libavdevice.62.1.100.dylib
${CMAKE_INSTALL_PREFIX}/lib/libavdevice.62.3.102.dylib
${CMAKE_INSTALL_PREFIX}/lib/libavdevice.62.dylib
${CMAKE_INSTALL_PREFIX}/lib/libavdevice.dylib
${CMAKE_INSTALL_PREFIX}/lib/libavformat.62.3.100.dylib
${CMAKE_INSTALL_PREFIX}/lib/libavformat.62.12.102.dylib
${CMAKE_INSTALL_PREFIX}/lib/libavformat.62.dylib
${CMAKE_INSTALL_PREFIX}/lib/libavformat.dylib
${CMAKE_INSTALL_PREFIX}/lib/libavutil.60.8.100.dylib
${CMAKE_INSTALL_PREFIX}/lib/libavutil.60.26.102.dylib
${CMAKE_INSTALL_PREFIX}/lib/libavutil.60.dylib
${CMAKE_INSTALL_PREFIX}/lib/libavutil.dylib
${CMAKE_INSTALL_PREFIX}/lib/libswresample.6.1.100.dylib
${CMAKE_INSTALL_PREFIX}/lib/libswresample.6.3.102.dylib
${CMAKE_INSTALL_PREFIX}/lib/libswresample.6.dylib
${CMAKE_INSTALL_PREFIX}/lib/libswresample.dylib
${CMAKE_INSTALL_PREFIX}/lib/libswscale.9.1.100.dylib
${CMAKE_INSTALL_PREFIX}/lib/libswscale.9.5.102.dylib
${CMAKE_INSTALL_PREFIX}/lib/libswscale.9.dylib
${CMAKE_INSTALL_PREFIX}/lib/libswscale.dylib)

Expand All @@ -55,22 +55,22 @@ else()
set(INSTALL_LIBS
${CMAKE_INSTALL_PREFIX}/lib/libavcodec.so
${CMAKE_INSTALL_PREFIX}/lib/libavcodec.so.62
${CMAKE_INSTALL_PREFIX}/lib/libavcodec.so.62.11.100
${CMAKE_INSTALL_PREFIX}/lib/libavcodec.so.62.28.102
${CMAKE_INSTALL_PREFIX}/lib/libavdevice.so
${CMAKE_INSTALL_PREFIX}/lib/libavdevice.so.62
${CMAKE_INSTALL_PREFIX}/lib/libavdevice.so.62.1.100
${CMAKE_INSTALL_PREFIX}/lib/libavdevice.so.62.3.102
${CMAKE_INSTALL_PREFIX}/lib/libavformat.so
${CMAKE_INSTALL_PREFIX}/lib/libavformat.so.62
${CMAKE_INSTALL_PREFIX}/lib/libavformat.so.62.3.100
${CMAKE_INSTALL_PREFIX}/lib/libavformat.so.62.12.102
${CMAKE_INSTALL_PREFIX}/lib/libavutil.so
${CMAKE_INSTALL_PREFIX}/lib/libavutil.so.60
${CMAKE_INSTALL_PREFIX}/lib/libavutil.so.60.8.100
${CMAKE_INSTALL_PREFIX}/lib/libavutil.so.60.26.102
${CMAKE_INSTALL_PREFIX}/lib/libswresample.so
${CMAKE_INSTALL_PREFIX}/lib/libswresample.so.6
${CMAKE_INSTALL_PREFIX}/lib/libswresample.so.6.1.100
${CMAKE_INSTALL_PREFIX}/lib/libswresample.so.6.3.102
${CMAKE_INSTALL_PREFIX}/lib/libswscale.so
${CMAKE_INSTALL_PREFIX}/lib/libswscale.so.9
${CMAKE_INSTALL_PREFIX}/lib/libswscale.so.9.1.100)
${CMAKE_INSTALL_PREFIX}/lib/libswscale.so.9.5.102)

install(
FILES ${INSTALL_LIBS}
Expand Down
36 changes: 24 additions & 12 deletions cmake/SuperBuild/BuildFFmpeg.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@ if(WIN32)
find_package(Msys REQUIRED)
endif()

# The GitHub mirror rather than ffmpeg.org, which has been failing to serve
# the releases. Still a download rather than a clone, so the build steps
# behind it are not disturbed. What it does not carry is the VERSION file the
# release tarballs have, nor a .git to read a tag from, so FFmpeg builds
# itself as version "unknown" -- av_version_info() is not read anywhere here,
# and the library versions come from the source.
#
# The library versions are written out in the install names in Package.cmake,
# so check them against libavutil/version.h and its siblings when this moves:
# a point release bumps them.
set(FFmpeg_URL https://github.com/FFmpeg/FFmpeg/archive/refs/tags/n8.1.2.tar.gz)

set(FFmpeg_DEPS ZLIB)
if(toucan_svt-av1)
list(APPEND FFmpeg_DEPS svt-av1)
Expand Down Expand Up @@ -352,42 +364,42 @@ else()
set(FFmpeg_INSTALL make install)
if(APPLE)
list(APPEND FFmpeg_INSTALL
COMMAND install_name_tool -id @rpath/libavcodec.62.11.100.dylib ${CMAKE_INSTALL_PREFIX}/lib/libavcodec.62.dylib
COMMAND install_name_tool -id @rpath/libavdevice.62.1.100.dylib ${CMAKE_INSTALL_PREFIX}/lib/libavdevice.62.dylib
COMMAND install_name_tool -id @rpath/libavformat.62.3.100.dylib ${CMAKE_INSTALL_PREFIX}/lib/libavformat.62.dylib
COMMAND install_name_tool -id @rpath/libavutil.60.8.100.dylib ${CMAKE_INSTALL_PREFIX}/lib/libavutil.60.dylib
COMMAND install_name_tool -id @rpath/libswresample.6.1.100.dylib ${CMAKE_INSTALL_PREFIX}/lib/libswresample.6.dylib
COMMAND install_name_tool -id @rpath/libswscale.9.1.100.dylib ${CMAKE_INSTALL_PREFIX}/lib/libswscale.9.dylib
COMMAND install_name_tool -id @rpath/libavcodec.62.28.102.dylib ${CMAKE_INSTALL_PREFIX}/lib/libavcodec.62.dylib
COMMAND install_name_tool -id @rpath/libavdevice.62.3.102.dylib ${CMAKE_INSTALL_PREFIX}/lib/libavdevice.62.dylib
COMMAND install_name_tool -id @rpath/libavformat.62.12.102.dylib ${CMAKE_INSTALL_PREFIX}/lib/libavformat.62.dylib
COMMAND install_name_tool -id @rpath/libavutil.60.26.102.dylib ${CMAKE_INSTALL_PREFIX}/lib/libavutil.60.dylib
COMMAND install_name_tool -id @rpath/libswresample.6.3.102.dylib ${CMAKE_INSTALL_PREFIX}/lib/libswresample.6.dylib
COMMAND install_name_tool -id @rpath/libswscale.9.5.102.dylib ${CMAKE_INSTALL_PREFIX}/lib/libswscale.9.dylib
COMMAND install_name_tool
-change ${CMAKE_INSTALL_PREFIX}/lib/libswresample.6.dylib @rpath/libswresample.6.dylib
-change ${CMAKE_INSTALL_PREFIX}/lib/libavutil.60.dylib @rpath/libavutil.60.dylib
${CMAKE_INSTALL_PREFIX}/lib/libavcodec.62.11.100.dylib
${CMAKE_INSTALL_PREFIX}/lib/libavcodec.62.28.102.dylib
COMMAND install_name_tool
-change ${CMAKE_INSTALL_PREFIX}/lib/libswscale.9.dylib @rpath/libswscale.9.dylib
-change ${CMAKE_INSTALL_PREFIX}/lib/libavformat.62.dylib @rpath/libavformat.62.dylib
-change ${CMAKE_INSTALL_PREFIX}/lib/libavcodec.62.dylib @rpath/libavcodec.62.dylib
-change ${CMAKE_INSTALL_PREFIX}/lib/libswresample.6.dylib @rpath/libswresample.6.dylib
-change ${CMAKE_INSTALL_PREFIX}/lib/libavutil.60.dylib @rpath/libavutil.60.dylib
${CMAKE_INSTALL_PREFIX}/lib/libavdevice.62.1.100.dylib
${CMAKE_INSTALL_PREFIX}/lib/libavdevice.62.3.102.dylib
COMMAND install_name_tool
-change ${CMAKE_INSTALL_PREFIX}/lib/libavcodec.62.dylib @rpath/libavcodec.62.dylib
-change ${CMAKE_INSTALL_PREFIX}/lib/libswresample.6.dylib @rpath/libswresample.6.dylib
-change ${CMAKE_INSTALL_PREFIX}/lib/libavutil.60.dylib @rpath/libavutil.60.dylib
${CMAKE_INSTALL_PREFIX}/lib/libavformat.62.3.100.dylib
${CMAKE_INSTALL_PREFIX}/lib/libavformat.62.12.102.dylib
COMMAND install_name_tool
-change ${CMAKE_INSTALL_PREFIX}/lib/libavutil.60.dylib @rpath/libavutil.60.dylib
${CMAKE_INSTALL_PREFIX}/lib/libswresample.6.1.100.dylib
${CMAKE_INSTALL_PREFIX}/lib/libswresample.6.3.102.dylib
COMMAND install_name_tool
-change ${CMAKE_INSTALL_PREFIX}/lib/libavutil.60.dylib @rpath/libavutil.60.dylib
${CMAKE_INSTALL_PREFIX}/lib/libswscale.9.1.100.dylib)
${CMAKE_INSTALL_PREFIX}/lib/libswscale.9.5.102.dylib)
endif()
endif()

ExternalProject_Add(
FFmpeg
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/FFmpeg
DEPENDS ${FFmpeg_DEPS}
URL https://ffmpeg.org/releases/ffmpeg-8.0.tar.bz2
URL ${FFmpeg_URL}
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env PKG_CONFIG_PATH=${CMAKE_INSTALL_PREFIX}/lib/pkgconfig ${FFmpeg_CONFIGURE}
BUILD_COMMAND ${FFmpeg_BUILD}
INSTALL_COMMAND ${FFmpeg_INSTALL}
Expand Down
2 changes: 1 addition & 1 deletion cmake/SuperBuild/BuildFreetype.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include(ExternalProject)

set(Freetype_GIT_REPOSITORY "https://github.com/freetype/freetype.git")
set(Freetype_GIT_TAG "VER-2-13-3")
set(Freetype_GIT_TAG "VER-2-14-1")

set(Freetype_ARGS
${toucan_EXTERNAL_PROJECT_ARGS}
Expand Down
2 changes: 1 addition & 1 deletion cmake/SuperBuild/BuildImath.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include(ExternalProject)

set(Imath_GIT_REPOSITORY "https://github.com/AcademySoftwareFoundation/Imath.git")
set(Imath_GIT_TAG "v3.1.12")
set(Imath_GIT_TAG "v3.2.1")

set(Imath_ARGS
${toucan_EXTERNAL_PROJECT_ARGS}
Expand Down
2 changes: 1 addition & 1 deletion cmake/SuperBuild/BuildOpenColorIO.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include(ExternalProject)

set(OpenColorIO_GIT_REPOSITORY "https://github.com/AcademySoftwareFoundation/OpenColorIO.git")
set(OpenColorIO_GIT_TAG "v2.4.2")
set(OpenColorIO_GIT_TAG "v2.5.2")

set(OpenColorIO_ARGS
${toucan_EXTERNAL_PROJECT_ARGS}
Expand Down
12 changes: 8 additions & 4 deletions cmake/SuperBuild/BuildOpenEXR.cmake
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
include(ExternalProject)

set(OpenEXR_GIT_REPOSITORY "https://github.com/AcademySoftwareFoundation/openexr.git")
set(OpenEXR_GIT_TAG "v3.3.5")
set(OpenEXR_GIT_TAG "v3.4.15")

set(OpenEXR_ARGS
${toucan_EXTERNAL_PROJECT_ARGS}
-DOPENEXR_BUILD_TOOLS=OFF
-DOPENEXR_INSTALL_EXAMPLES=OFF
-DOPENEXR_BUILD_EXAMPLES=OFF
-DBUILD_TESTING=OFF
-DOPENEXR_FORCE_INTERNAL_DEFLATE=ON)
-DOPENEXR_FORCE_INTERNAL_DEFLATE=ON
# OFF is the default, said out loud because it is what makes OpenEXR
# look for the OpenJPH built above rather than quietly building its
# own vendored copy.
-DOPENEXR_FORCE_INTERNAL_OPENJPH=OFF)

ExternalProject_Add(
OpenEXR
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/OpenEXR
DEPENDS Imath ZLIB
DEPENDS Imath ZLIB OpenJPH
GIT_REPOSITORY ${OpenEXR_GIT_REPOSITORY}
GIT_TAG ${OpenEXR_GIT_TAG}
CMAKE_ARGS ${OpenEXR_ARGS})
2 changes: 1 addition & 1 deletion cmake/SuperBuild/BuildOpenImageIO.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include(ExternalProject)

set(OpenImageIO_GIT_REPOSITORY "https://github.com/AcademySoftwareFoundation/OpenImageIO.git")
set(OpenImageIO_GIT_TAG "v3.0.10.0")
set(OpenImageIO_GIT_TAG "v3.1.16.0")

set(OpenImageIO_DEPS)
if(toucan_PNG)
Expand Down
25 changes: 25 additions & 0 deletions cmake/SuperBuild/BuildOpenJPH.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
include(ExternalProject)

# The HTJ2K codec behind OpenEXR's HTJ2K compression. OpenEXR carries a
# vendored copy and falls back to it silently when it cannot find an
# installed one, so this is built into the prefix ahead of OpenEXR and
# found there -- one copy, at a version written down here.
set(OpenJPH_VERSION "0.31.0")
set(OpenJPH_URL "https://github.com/aous72/OpenJPH/archive/refs/tags/${OpenJPH_VERSION}.tar.gz")
set(OpenJPH_HASH "SHA256=fe169dbbaae71a169a0a6a68dccb346616193252c1ca044217afa0d5d1dc436f")

set(OpenJPH_ARGS
${toucan_EXTERNAL_PROJECT_ARGS}
-DOJPH_BUILD_EXECUTABLES=OFF
-DOJPH_BUILD_TESTS=OFF
# The codec does not read or write TIFF; only the command line tools
# above do, and they are not built.
-DOJPH_ENABLE_TIFF_SUPPORT=OFF)

ExternalProject_Add(
OpenJPH
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/OpenJPH
URL ${OpenJPH_URL}
URL_HASH ${OpenJPH_HASH}
LIST_SEPARATOR |
CMAKE_ARGS ${OpenJPH_ARGS})
34 changes: 31 additions & 3 deletions cmake/SuperBuild/BuildOpenTimelineIO.cmake
Original file line number Diff line number Diff line change
@@ -1,17 +1,45 @@
include(ExternalProject)

find_package(Git REQUIRED)

set(OpenTimelineIO_GIT_REPOSITORY "https://github.com/AcademySoftwareFoundation/OpenTimelineIO.git")
set(OpenTimelineIO_GIT_TAG "v0.18.0")
# "Add core C++ support for otioz and otiod, take 2 (#2021)", which also adds
# bundle support for multiple media references and image sequences. Newer than
# v0.18.1, which does not have it.
set(OpenTimelineIO_GIT_TAG "0eebd211b2055f111e2c53d04b5581adc594c1fc")

set(OpenTimelineIO_ARGS
${toucan_EXTERNAL_PROJECT_ARGS}
-DOTIO_SHARED_LIBS=${BUILD_SHARED_LIBS}
-DOTIO_FIND_IMATH=ON)
-DOTIO_FIND_IMATH=ON
# Use the minizip-ng and zlib from the super build; without this OTIO
# builds its own copies of both for its otioz and otiod support. This
# depends on the patch below.
-DOTIO_FIND_MINIZIP_NG=ON)

# OTIO is patched, with two changes; see the notes in the patch itself.
#
# The first has it link whichever minizip-ng target is present rather than
# assuming the one from the compatibility layer. Without it OTIO cannot be
# built against the super build's minizip-ng, which is built without that
# layer.
#
# The second is what a shared build on Windows needs: the export macros become
# PRIVATE and the members that lacked OTIO_API get it. A static build does not
# need it, and it is carried unchanged so that the patch stays the one
# tlRender uses.
#
# It goes away once these are upstream.
ExternalProject_Add(
OpenTimelineIO
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/OpenTimelineIO
DEPENDS Imath
DEPENDS Imath minizip-ng
GIT_REPOSITORY ${OpenTimelineIO_GIT_REPOSITORY}
GIT_TAG ${OpenTimelineIO_GIT_TAG}
PATCH_COMMAND ${CMAKE_COMMAND}
-DGIT_EXECUTABLE=${GIT_EXECUTABLE}
-DOTIO_SOURCE_DIR=${CMAKE_CURRENT_BINARY_DIR}/OpenTimelineIO/src/OpenTimelineIO
-DOTIO_PATCH=${CMAKE_CURRENT_SOURCE_DIR}/OTIO-patch/otio.patch
-P ${CMAKE_CURRENT_LIST_DIR}/OTIOApplyPatch.cmake
LIST_SEPARATOR |
CMAKE_ARGS ${OpenTimelineIO_ARGS})
13 changes: 9 additions & 4 deletions cmake/SuperBuild/BuildTIFF.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
include(ExternalProject)

set(TIFF_GIT_REPOSITORY "https://gitlab.com/libtiff/libtiff.git")
set(TIFF_GIT_TAG "v4.5.0")
# The release tarball rather than a clone of the repository. gitlab.com
# answers git over HTTPS with 403 often enough to fail a build -- three
# attempts in a row, on a runner that had done nothing else -- and this is
# the project's own download host, which does not.
set(TIFF_VERSION "4.7.2")
set(TIFF_URL "https://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz")
set(TIFF_HASH "SHA256=672bd7d10aee4606171afb864f3570b83340f6a33e2c186dc0512f7145ffdf6a")

set(TIFF_ARGS
${toucan_EXTERNAL_PROJECT_ARGS}
Expand All @@ -24,6 +29,6 @@ ExternalProject_Add(
TIFF
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/TIFF
DEPENDS ZLIB
GIT_REPOSITORY ${TIFF_GIT_REPOSITORY}
GIT_TAG ${TIFF_GIT_TAG}
URL ${TIFF_URL}
URL_HASH ${TIFF_HASH}
CMAKE_ARGS ${TIFF_ARGS})
2 changes: 1 addition & 1 deletion cmake/SuperBuild/Buildexpat.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include(ExternalProject)

set(expat_GIT_REPOSITORY "https://github.com/libexpat/libexpat.git")
set(expat_GIT_TAG "R_2_5_0")
set(expat_GIT_TAG "R_2_7_2")

set(expat_ARGS
${toucan_EXTERNAL_PROJECT_ARGS}
Expand Down
3 changes: 2 additions & 1 deletion cmake/SuperBuild/Buildminizip-ng.cmake
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
include(ExternalProject)

set(minizip-ng_GIT_REPOSITORY "https://github.com/zlib-ng/minizip-ng.git")
set(minizip-ng_GIT_TAG "3.0.7")
set(minizip-ng_GIT_TAG "4.0.10")

set(minizip-ng_ARGS
${toucan_EXTERNAL_PROJECT_ARGS}
-DMZ_COMPAT=OFF
-DMZ_BZIP2=OFF
-DMZ_LZMA=OFF
-DMZ_ZSTD=OFF
Expand Down
21 changes: 12 additions & 9 deletions cmake/SuperBuild/Buildsvt-av1.cmake
Original file line number Diff line number Diff line change
@@ -1,27 +1,30 @@
include(ExternalProject)

set(svt-av1_GIT_REPOSITORY "https://gitlab.com/AOMediaCodec/SVT-AV1.git")
set(svt-av1_GIT_TAG "v2.3.0")
# The tag's tarball rather than a clone, for the same reason as TIFF: this
# project also lives on gitlab.com, whose git over HTTPS returns 403 often
# enough to fail a build. The GitHub repository is the project's own mirror,
# and NASM is already fetched from a GitHub tag archive here.
set(svt-av1_VERSION "4.0.1")
set(svt-av1_URL "https://github.com/AOMediaCodec/SVT-AV1/archive/refs/tags/v${svt-av1_VERSION}.tar.gz")
set(svt-av1_HASH "SHA256=fb3e983b82955575e01bce260d2bee6551f329db8154e4a0f69947093354d3dc")

set(svt-av1_DEPS)
if(NOT WIN32)
list(APPEND svt-av1_DEPS NASM)
endif()

set(svt-av1_PATCH ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/svt-av1-patch/Source/Lib/pkg-config.pc.in
${CMAKE_CURRENT_BINARY_DIR}/svt-av1/src/svt-av1/Source/Lib/pkg-config.pc.in)

set(svt-av1_ARGS
${toucan_EXTERNAL_PROJECT_ARGS}
-DBUILD_APPS=OFF
-DCMAKE_POSITION_INDEPENDENT_CODE=ON)
if(NOT WIN32)
list(APPEND svt-av1_ARGS -DCMAKE_ASM_NASM_COMPILER=${CMAKE_INSTALL_PREFIX}/bin/nasm)
endif()

ExternalProject_Add(
svt-av1
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/svt-av1
DEPENDS ${svt-av1_DEPS}
GIT_REPOSITORY ${svt-av1_GIT_REPOSITORY}
GIT_TAG ${svt-av1_GIT_TAG}
PATCH_COMMAND ${svt-av1_PATCH}
URL ${svt-av1_URL}
URL_HASH ${svt-av1_HASH}
CMAKE_ARGS ${svt-av1_ARGS})
5 changes: 4 additions & 1 deletion cmake/SuperBuild/Buildyaml-cpp.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include(ExternalProject)

set(yaml-cpp_GIT_REPOSITORY "https://github.com/jbeder/yaml-cpp.git")
set(yaml-cpp_GIT_TAG "yaml-cpp-0.7.0")
set(yaml-cpp_GIT_TAG "0.8.0")

set(yaml-cpp_ARGS
${toucan_EXTERNAL_PROJECT_ARGS}
Expand All @@ -15,5 +15,8 @@ ExternalProject_Add(
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/yaml-cpp
GIT_REPOSITORY ${yaml-cpp_GIT_REPOSITORY}
GIT_TAG ${yaml-cpp_GIT_TAG}
PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-patch/src/emitterutils.cpp
${CMAKE_CURRENT_BINARY_DIR}/yaml-cpp/src/yaml-cpp/src/emitterutils.cpp
LIST_SEPARATOR |
CMAKE_ARGS ${yaml-cpp_ARGS})
1 change: 1 addition & 0 deletions cmake/SuperBuild/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ if(toucan_Imath)
include(BuildImath)
endif()
if(toucan_OpenEXR)
include(BuildOpenJPH)
include(BuildOpenEXR)
endif()
if(toucan_svt-av1)
Expand Down
Loading
Loading