Build: Library updates for 4.1
Update libraries to match VFX platform 2024, and a few other upgrades to latest versions. boost 1.82.0 deflate 1.18 (new) ffi 3.4.4 freeglut (deleted) ispc 1.12.1 llvm 17.0.6 materialx 1.38.8 mesa 23.3.0 numpy 1.24.3 opencolorio 2.3.0 openexr 3.2.1 openimageio 2.5.6.0 opensubdiv 3.6.0 openvdb 11.0.0 osl 1.13.5.0 (now dynamic) python 3.11.6 sqlite 3.42.0 sse2neon 0d6e9b3dd4 usd 23.11 vulkan 1.3.270 xm2 2.12.3 This only updates the build scripts, the precompiled libraries for each platform will land over the coming weeks. Ref #113157 Co-authored-by: Ray Molenkamp <github@lazydodo.com> Co-authored-by: Campbell Barton <campbell@blender.org> Pull Request: https://projects.blender.org/blender/blender/pulls/116420
This commit is contained in:
committed by
Brecht Van Lommel
parent
e8c5f8dddf
commit
802ac5ba5a
@@ -15,6 +15,7 @@ set(INC
|
||||
set(INC_SYS
|
||||
${JPEG_INCLUDE_DIR}
|
||||
${ZLIB_INCLUDE_DIRS}
|
||||
${IMATH_INCLUDE_DIRS}
|
||||
${OPENIMAGEIO_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
|
||||
@@ -527,6 +527,22 @@ if(WITH_OPENCOLORIO)
|
||||
)
|
||||
endif()
|
||||
if(WIN32)
|
||||
if(EXISTS ${LIBDIR}/osl/bin/oslquery.dll) # 4.1+
|
||||
windows_install_shared_manifest(
|
||||
FILES ${LIBDIR}/osl/bin/oslquery.dll
|
||||
${LIBDIR}/osl/bin/oslcomp.dll
|
||||
${LIBDIR}/osl/bin/oslexec.dll
|
||||
${LIBDIR}/osl/bin/oslnoise.dll
|
||||
RELEASE
|
||||
)
|
||||
windows_install_shared_manifest(
|
||||
FILES ${LIBDIR}/osl/bin/oslquery_d.dll
|
||||
${LIBDIR}/osl/bin/oslcomp_d.dll
|
||||
${LIBDIR}/osl/bin/oslexec_d.dll
|
||||
${LIBDIR}/osl/bin/oslnoise_d.dll
|
||||
DEBUG
|
||||
)
|
||||
endif()
|
||||
if(EXISTS ${LIBDIR}/opencolorio/bin/opencolorio_2_2.dll) # 3.5
|
||||
windows_install_shared_manifest(
|
||||
FILES ${LIBDIR}/opencolorio/bin/opencolorio_2_2.dll
|
||||
@@ -547,6 +563,26 @@ if(WIN32)
|
||||
CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
|
||||
)
|
||||
endif()
|
||||
if(EXISTS ${LIBDIR}/opencolorio/bin/opencolorio_2_3.dll) # 4.1
|
||||
windows_install_shared_manifest(
|
||||
FILES ${LIBDIR}/opencolorio/bin/opencolorio_2_3.dll
|
||||
RELEASE
|
||||
)
|
||||
windows_install_shared_manifest(
|
||||
FILES ${LIBDIR}/opencolorio/bin/opencolorio_d_2_3.dll
|
||||
DEBUG
|
||||
)
|
||||
install(
|
||||
DIRECTORY ${LIBDIR}/opencolorio/lib/site-packages-debug/PyOpenColorIO
|
||||
DESTINATION ${TARGETDIR_VER}/python/lib/site-packages
|
||||
CONFIGURATIONS Debug
|
||||
)
|
||||
install(
|
||||
DIRECTORY ${LIBDIR}/opencolorio/lib/site-packages/PyOpenColorIO
|
||||
DESTINATION ${TARGETDIR_VER}/python/lib/site-packages
|
||||
CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
|
||||
)
|
||||
endif()
|
||||
if(EXISTS ${LIBDIR}/OpenImageDenoise/bin/openimagedenoise.dll) # 4.0
|
||||
windows_install_shared_manifest(
|
||||
FILES
|
||||
@@ -1061,22 +1097,6 @@ elseif(WIN32)
|
||||
DEBUG
|
||||
)
|
||||
|
||||
# This will not exist for 3.4 and earlier lib folders
|
||||
# to ease the transition, support both 3.4 and 3.5 lib
|
||||
# folders.
|
||||
if(EXISTS ${LIBDIR}/openvdb/python/pyopenvdb_d.pyd)
|
||||
install(
|
||||
FILES ${LIBDIR}/openvdb/python/pyopenvdb_d.pyd
|
||||
DESTINATION ${TARGETDIR_VER}/python/lib/site-packages
|
||||
CONFIGURATIONS Debug
|
||||
)
|
||||
install(
|
||||
FILES ${LIBDIR}/openvdb/python/pyopenvdb.pyd
|
||||
DESTINATION ${TARGETDIR_VER}/python/lib/site-packages
|
||||
CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
|
||||
)
|
||||
endif()
|
||||
|
||||
windows_install_shared_manifest(
|
||||
FILES
|
||||
${LIBDIR}/materialx/bin/MaterialXCore.dll
|
||||
@@ -1105,6 +1125,18 @@ elseif(WIN32)
|
||||
DEBUG
|
||||
)
|
||||
endif()
|
||||
if(EXISTS ${LIBDIR}/materialx/bin/MaterialXGenMsl.dll) # 4.1+
|
||||
windows_install_shared_manifest(
|
||||
FILES
|
||||
${LIBDIR}/materialx/bin/MaterialXGenMsl.dll
|
||||
RELEASE
|
||||
)
|
||||
windows_install_shared_manifest(
|
||||
FILES
|
||||
${LIBDIR}/materialx/bin/MaterialXGenMsl_d.dll
|
||||
DEBUG
|
||||
)
|
||||
endif()
|
||||
windows_install_shared_manifest(
|
||||
FILES
|
||||
${LIBDIR}/materialx/bin/MaterialXCore_d.dll
|
||||
@@ -1245,6 +1277,36 @@ elseif(WIN32)
|
||||
)
|
||||
endif()
|
||||
|
||||
# This will not exist for 3.4 and earlier lib folders
|
||||
# to ease the transition, support both 3.4 and 3.5 lib
|
||||
# folders.
|
||||
if(EXISTS ${LIBDIR}/openvdb/python/pyopenvdb_d.pyd)
|
||||
install(
|
||||
FILES ${LIBDIR}/openvdb/python/pyopenvdb_d.pyd
|
||||
DESTINATION ${TARGETDIR_VER}/python/lib/site-packages
|
||||
CONFIGURATIONS Debug
|
||||
)
|
||||
install(
|
||||
FILES ${LIBDIR}/openvdb/python/pyopenvdb.pyd
|
||||
DESTINATION ${TARGETDIR_VER}/python/lib/site-packages
|
||||
CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
|
||||
)
|
||||
endif()
|
||||
|
||||
# this will exist for 4.1 lib folders
|
||||
if(EXISTS ${LIBDIR}/openvdb/python/pyopenvdb_d.cp${_PYTHON_VERSION_NO_DOTS}-win_amd64.pyd)
|
||||
install(
|
||||
FILES ${LIBDIR}/openvdb/python/pyopenvdb_d.cp${_PYTHON_VERSION_NO_DOTS}-win_amd64.pyd
|
||||
DESTINATION ${TARGETDIR_VER}/python/lib/site-packages
|
||||
CONFIGURATIONS Debug
|
||||
)
|
||||
install(
|
||||
FILES ${LIBDIR}/openvdb/python/pyopenvdb.cp${_PYTHON_VERSION_NO_DOTS}-win_amd64.pyd
|
||||
DESTINATION ${TARGETDIR_VER}/python/lib/site-packages
|
||||
CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
|
||||
)
|
||||
endif()
|
||||
|
||||
# MaterialX python bindings
|
||||
install(
|
||||
DIRECTORY ${LIBDIR}/materialx/python/Release/MaterialX
|
||||
|
||||
Reference in New Issue
Block a user