Merge branch 'blender-v4.1-release'
This commit is contained in:
commit
d012a46605
@ -91,15 +91,6 @@ set(LIB
|
||||
)
|
||||
|
||||
if(WITH_IMAGE_OPENEXR)
|
||||
# Keep until APPLE/ARM libraries are updated.
|
||||
if(APPLE)
|
||||
if(CMAKE_OSX_ARCHITECTURES MATCHES arm64)
|
||||
list(APPEND INC_SYS
|
||||
${IMATH_INCLUDE_DIRS}
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
list(APPEND LIB
|
||||
bf_imbuf_openexr
|
||||
)
|
||||
@ -110,6 +101,15 @@ else()
|
||||
)
|
||||
endif()
|
||||
|
||||
# Keep until APPLE/ARM libraries are updated.
|
||||
if(APPLE)
|
||||
if(CMAKE_OSX_ARCHITECTURES MATCHES arm64)
|
||||
list(APPEND INC_SYS
|
||||
${IMATH_INCLUDE_DIRS}
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(WITH_IMAGE_OPENJPEG)
|
||||
list(APPEND INC_SYS
|
||||
${OPENJPEG_INCLUDE_DIRS}
|
||||
|
@ -36,15 +36,6 @@ if(WITH_PUGIXML)
|
||||
endif()
|
||||
|
||||
if(WITH_IMAGE_OPENEXR)
|
||||
# Keep until APPLE/ARM libraries are updated.
|
||||
if(APPLE)
|
||||
if(CMAKE_OSX_ARCHITECTURES MATCHES arm64)
|
||||
list(APPEND INC_SYS
|
||||
${IMATH_INCLUDE_DIRS}
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
list(APPEND INC_SYS
|
||||
${OPENEXR_INCLUDE_DIRS}
|
||||
)
|
||||
@ -53,4 +44,13 @@ if(WITH_IMAGE_OPENEXR)
|
||||
)
|
||||
endif()
|
||||
|
||||
# Keep until APPLE/ARM libraries are updated.
|
||||
if(APPLE)
|
||||
if(CMAKE_OSX_ARCHITECTURES MATCHES arm64)
|
||||
list(APPEND INC_SYS
|
||||
${IMATH_INCLUDE_DIRS}
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
blender_add_lib(bf_imbuf_openimageio "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
||||
|
Loading…
Reference in New Issue
Block a user