mirror of
https://github.com/blender/blender
synced 2026-10-25 03:07:01 +03:00
cd754c5ccc
New libraries: * KTX * OpenTimelineIO * Jolt * hwloc * RapidJSON Updated libraries: * LLVM * OSL * OpenImageIO * OpenUSD * DPC++ * minizip-ng * flac Build changes for existing libraries: * OpenEXR (build Python bindings) * FFmpeg (add additional hardware acceleration backends) * Enable CUDA/OptiX support for Windows ARM64 (LLVM, OSL, OIDN) Removed libraries: * fastjsonschema For a full list of upgraded dependencies, specific versions and additional notes, see the main library change tracking issue below. Pull Request: https://projects.blender.org/blender/blender/pulls/162972 Ref: #158444 Co-authored-by: Thomas Dinges <thomas@blender.org> Co-authored-by: Anthony Roberts <anthony.roberts@linaro.org> Co-authored-by: Ray Molenkamp <github@lazydodo.com> Co-authored-by: Brecht Van Lommel <brecht@blender.org> Co-authored-by: Campbell Barton <campbell@blender.org> Co-authored-by: Sebastian Parborg <sebastian@blender.org> Co-authored-by: Patrick Mours <pmours@nvidia.com> Co-authored-by: Nikita Sirgienko <nikita.sirgienko@intel.com> Co-authored-by: John Kiril Swenson <john@blender.org>
106 lines
3.8 KiB
Diff
106 lines
3.8 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index ea11696eefc..9ccab5fd745 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -95,7 +95,7 @@ if(OTIO_PYTHON_INSTALL)
|
|
# either python_install or install_prefix have been set
|
|
if(NOT OTIO_PYTHON_INSTALL_DIR)
|
|
# CMAKE_INSTALL_PREFIX was set, so install the python components there
|
|
- set(OTIO_RESOLVED_PYTHON_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/python")
|
|
+ set(OTIO_RESOLVED_PYTHON_INSTALL_DIR "python")
|
|
|
|
# In order to not require setting $PYTHONPATH to point at the .so,
|
|
# the shared libraries are installed into the python library
|
|
@@ -114,7 +114,7 @@ if(OTIO_PYTHON_INSTALL)
|
|
endif()
|
|
|
|
else()
|
|
- set(OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")
|
|
+ set(OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR "lib")
|
|
message(STATUS "OTIO C++ installing to ${CMAKE_INSTALL_PREFIX}")
|
|
endif()
|
|
|
|
@@ -151,7 +151,8 @@ endif()
|
|
#
|
|
math(EXPR OTIO_SOVERSION "${OTIO_VERSION_MAJOR} * 100 + ${OTIO_VERSION_MINOR}")
|
|
|
|
-set(OTIO_RESOLVED_CXX_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
|
|
+# Relative destinations keep installed CMake targets relocatable.
|
|
+set(OTIO_RESOLVED_CXX_INSTALL_DIR ".")
|
|
|
|
if(OTIO_CXX_INSTALL)
|
|
message(STATUS "Installing C++ bindings to: ${OTIO_RESOLVED_CXX_INSTALL_DIR}")
|
|
@@ -282,7 +283,7 @@ endif()
|
|
|
|
#----- minizip-ng
|
|
if(OTIO_FIND_MINIZIP_NG)
|
|
- find_package(minizip-ng REQUIRED)
|
|
+ find_package(minizip-ng CONFIG REQUIRED NAMES minizip)
|
|
if (minizip-ng_FOUND)
|
|
message(STATUS "Found minizip-ng at ${minizip-ng_CONFIG}")
|
|
endif()
|
|
diff --git a/src/opentime/CMakeLists.txt b/src/opentime/CMakeLists.txt
|
|
index 4f071060ecb..6b8bf526100 100644
|
|
--- a/src/opentime/CMakeLists.txt
|
|
+++ b/src/opentime/CMakeLists.txt
|
|
@@ -41,7 +41,7 @@ endif()
|
|
|
|
if(APPLE)
|
|
set_target_properties(opentime PROPERTIES
|
|
- INSTALL_NAME_DIR "@loader_path"
|
|
+ INSTALL_NAME_DIR "@rpath"
|
|
MACOSX_RPATH ON)
|
|
endif()
|
|
|
|
@@ -53,6 +53,8 @@ target_compile_options(opentime PRIVATE
|
|
)
|
|
|
|
if(OTIO_CXX_INSTALL)
|
|
+ # Blender installs C++ libraries separately from the Python extensions.
|
|
+ set(OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR "lib")
|
|
install(FILES ${OPENTIME_HEADER_FILES}
|
|
DESTINATION "${OTIO_RESOLVED_CXX_INSTALL_DIR}/include/opentime")
|
|
|
|
@@ -90,4 +92,3 @@ if(OTIO_CXX_INSTALL)
|
|
${OTIO_RESOLVED_CXX_INSTALL_DIR}/lib/cmake/opentime
|
|
)
|
|
endif()
|
|
-
|
|
diff --git a/src/opentimelineio/CMakeLists.txt b/src/opentimelineio/CMakeLists.txt
|
|
index dd1c881c51b..3a861a61e4e 100644
|
|
--- a/src/opentimelineio/CMakeLists.txt
|
|
+++ b/src/opentimelineio/CMakeLists.txt
|
|
@@ -118,7 +118,7 @@ endif()
|
|
|
|
if(APPLE)
|
|
set_target_properties(opentimelineio PROPERTIES
|
|
- INSTALL_NAME_DIR "@loader_path"
|
|
+ INSTALL_NAME_DIR "@rpath"
|
|
MACOSX_RPATH ON)
|
|
endif()
|
|
|
|
@@ -131,6 +131,8 @@ target_compile_options(opentimelineio PRIVATE
|
|
)
|
|
|
|
if(OTIO_CXX_INSTALL)
|
|
+ # Blender installs C++ libraries separately from the Python extensions.
|
|
+ set(OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR "lib")
|
|
install(FILES ${OPENTIMELINEIO_HEADER_FILES}
|
|
DESTINATION "${OTIO_RESOLVED_CXX_INSTALL_DIR}/include/opentimelineio")
|
|
|
|
@@ -145,9 +147,12 @@ if(OTIO_CXX_INSTALL)
|
|
endif()
|
|
|
|
set(OTIO_CONFIG_DEPENDENCIES "")
|
|
- string(APPEND OTIO_CONFIG_DEPENDENCIES "find_dependency(ZLIB)\n")
|
|
- if(OTIO_FIND_MINIZIP_NG)
|
|
- string(APPEND OTIO_CONFIG_DEPENDENCIES "find_dependency(minizip-ng)\n")
|
|
+ # Private dependencies are already linked into Blender's shared library.
|
|
+ if(NOT OTIO_SHARED_LIBS)
|
|
+ string(APPEND OTIO_CONFIG_DEPENDENCIES "find_dependency(ZLIB)\n")
|
|
+ if(OTIO_FIND_MINIZIP_NG)
|
|
+ string(APPEND OTIO_CONFIG_DEPENDENCIES "find_dependency(minizip-ng CONFIG NAMES minizip)\n")
|
|
+ endif()
|
|
endif()
|
|
|
|
install(TARGETS opentimelineio
|