CMake: Disable Options Depending on OpenEXR Dependecies #106209

Merged
Jeroen Bakker merged 3 commits from Jeroen-Bakker/blender:cmake-imath-libraries into main 2023-04-03 09:51:02 +02:00
Member

OpenEXR has some dependecies that other other modules in Blender
requires. When disabling OpenEXR these dependecies could not match
and building blender would fail.

This PR disables the next options when WITH_IMAGE_OPENEXR=Off

  • WITH_OPENVDB
  • WITH_ALEMBIC
  • WITH_VULKAN_BACKEND
  • WITH_CYCLES_OSL

Additionally windows stores the IMath libraries in IMATH_LIBRARIES
Linux and Mac stored the IMath libraries in IMATH_LIBRARY. This
change will also adds IMATH_LIBRARIES variable to all platforms.

OpenEXR has some dependecies that other other modules in Blender requires. When disabling OpenEXR these dependecies could not match and building blender would fail. This PR disables the next options when `WITH_IMAGE_OPENEXR=Off` - `WITH_OPENVDB` - `WITH_ALEMBIC` - `WITH_VULKAN_BACKEND` - `WITH_CYCLES_OSL` Additionally windows stores the IMath libraries in `IMATH_LIBRARIES` Linux and Mac stored the IMath libraries in `IMATH_LIBRARY`. This change will also adds `IMATH_LIBRARIES` variable to all platforms.
Jeroen Bakker added this to the 3.6 LTS milestone 2023-03-28 08:44:11 +02:00
Jeroen Bakker added the
Module
Platforms, Builds & Tests
label 2023-03-28 08:44:11 +02:00
Jeroen Bakker self-assigned this 2023-03-28 08:44:11 +02:00
Jeroen Bakker added 1 commit 2023-03-28 08:44:15 +02:00
buildbot/vexp-code-patch-coordinator Build done. Details
3adbebe0df
CMake: Disable Options Depeding on OpenEXR dependecies.
OpenEXR has some dependecies that other other modules in Blender
requires. When disabling OpenEXR these dependecies could not match
and building blender would fail.

This PR disables the next options when WITH_IMAGE_OPENEXR=Off

- `WITH_OPENVDB`
- `WITH_ALEMBIC`
- `WITH_VULKAN_BACKEND`
- `WITH_CYCLES_OSL`

Additionally windows stores the IMath libraries in `IMATH_LIBRARIES`
Linux and Mac stored the IMath libraries in `IMATH_LIBRARY`. This
change will also adds `IMATH_LIBRARIES` variable to all platforms.
Jeroen Bakker requested review from Ray molenkamp 2023-03-28 08:44:22 +02:00
Jeroen Bakker requested review from Brecht Van Lommel 2023-03-28 08:44:35 +02:00
Jeroen Bakker changed title from CMake: Disable Options Depeding on OpenEXR dependecies. to CMake: Disable Options Depending on OpenEXR dependecies. 2023-03-28 08:45:24 +02:00
Jeroen Bakker changed title from CMake: Disable Options Depending on OpenEXR dependecies. to CMake: Disable Options Depending on OpenEXR Dependecies. 2023-03-28 08:45:31 +02:00
Author
Member

@blender-bot build

@blender-bot build
Brecht Van Lommel requested changes 2023-03-28 13:49:38 +02:00
@ -125,1 +123,3 @@
# 2.x and 3.x this way.
# For simplicity we also add it to the OpenEXR includes and libraries, as it's simpler to
# support both 2.x and 3.x this way.
SET(IMATH_LIBRARIES)

This code only runs for OpenEXR 3, so this does not work for 2. To handle both cases:

IF(OPENEXR_VERSION VERSION_GREATER_EQUAL "3.0.0")
	set(IMATH_LIBRARIES ${IMATH_LIBRARY})
ELSE()
	set(IMATH_LIBRARIES ${OPENEXR_IMATH_LIBRARY})
ENDIF()
This code only runs for OpenEXR 3, so this does not work for 2. To handle both cases: ``` IF(OPENEXR_VERSION VERSION_GREATER_EQUAL "3.0.0") set(IMATH_LIBRARIES ${IMATH_LIBRARY}) ELSE() set(IMATH_LIBRARIES ${OPENEXR_IMATH_LIBRARY}) ENDIF() ```
Jeroen-Bakker marked this conversation as resolved
Hans Goudey changed title from CMake: Disable Options Depending on OpenEXR Dependecies. to CMake: Disable Options Depending on OpenEXR Dependecies 2023-03-28 15:33:57 +02:00
Jeroen Bakker added 1 commit 2023-03-30 07:21:54 +02:00
Jeroen Bakker added 1 commit 2023-03-30 07:24:40 +02:00
Brecht Van Lommel approved these changes 2023-03-30 12:09:29 +02:00
Jeroen Bakker merged commit 4aed240b02 into main 2023-04-03 09:51:02 +02:00
Jeroen Bakker deleted branch cmake-imath-libraries 2023-04-03 09:51:03 +02:00
Sign in to join this conversation.
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset Browser
Interest
Asset Browser Project Overview
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
EEVEE & Viewport
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
EEVEE & Viewport
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Priority
High
Priority
Low
Priority
Normal
Priority
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
No Milestone
No project
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#106209
No description provided.