CMake: Fix Compiling Shader Builder on macOS #115929

Merged
Jeroen Bakker merged 1 commits from Jeroen-Bakker/blender:cmake/revert-changes into main 2023-12-08 15:47:25 +01:00
Member

Due to changes in the build environment shader_builder wasn't able to
compile on macOs. This patch reverts several recent changes to CMake files.

The idea is that in the near future shader_builder will run on the buildbot as
part of any regular build to ensure that changes to the CMake doesn't break
shader_builder and we only detect it after a few days.

Due to changes in the build environment shader_builder wasn't able to compile on macOs. This patch reverts several recent changes to CMake files. * dbb2844ed98f91395856ac3def258f170d78a819 * 94817f64b9780287be94f9c7a46257709622497d * 1b6cd937ffc8279aadeee2b262690452dea8c7d9 The idea is that in the near future shader_builder will run on the buildbot as part of any regular build to ensure that changes to the CMake doesn't break shader_builder and we only detect it after a few days.
Jeroen Bakker added the
Platform
macOS
Module
Platforms, Builds & Tests
labels 2023-12-08 10:29:43 +01:00
Jeroen Bakker self-assigned this 2023-12-08 10:29:43 +01:00
Jeroen Bakker added 1 commit 2023-12-08 10:29:51 +01:00
Due to changes in the build environment shader_builder wasn't able to
compile on macOs. With instructions of @LazyDodo we reverted the changes
one-by-one until they worked again.

This patch reverts `dbb2844ed98f91395856ac3def258f170d78a819`,
`94817f64b9780287be94f9c7a46257709622497d` and
`1b6cd937ffc8279aadeee2b262690452dea8c7d9`.

This PR is not intended to land into main. But as reference what the
state is that allows compilation and running of shader builder.
Jeroen Bakker requested review from Ray molenkamp 2023-12-08 10:30:08 +01:00
Jeroen Bakker added this to the Platforms, Builds Tests & Devices project 2023-12-08 10:30:21 +01:00
Ray molenkamp approved these changes 2023-12-08 14:47:35 +01:00
Ray molenkamp left a comment
Member

All those commits are essentially 99% automated work, so i have no strong attachment to the work, while i'd like to understand what is happening here, i'd probably need @brecht to take a look, and his schedule is busy enough as is, and if he has time i'd rather have him work on the 4.1 lib update, so I'd say we revert the ones you flagged, so you and clement can move forward again. Once shader_builder gets enabled by default on the mac bot, I'll pick up the cmake work again and we can figure out whats happening.

All those commits are essentially 99% automated work, so i have no strong attachment to the work, while i'd like to understand what is happening here, i'd probably need @brecht to take a look, and his schedule is busy enough as is, and if he has time i'd rather have him work on the 4.1 lib update, so I'd say we revert the ones you flagged, so you and clement can move forward again. Once shader_builder gets enabled by default on the mac bot, I'll pick up the cmake work again and we can figure out whats happening.
Member

accepted, but this does need a better title/commit message when landing

accepted, but this does need a better title/commit message when landing
Jeroen Bakker changed title from CMake: Revert Until shader_builder Runs Again to CMake: Fix Compiling Shader Builder on macOS 2023-12-08 15:42:26 +01:00
Jeroen Bakker added this to the 4.1 milestone 2023-12-08 15:47:03 +01:00
Jeroen Bakker merged commit 65e58fe574 into main 2023-12-08 15:47:25 +01:00
Sign in to join this conversation.
No reviewers
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset System
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
Asset Browser Project
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 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#115929
No description provided.