CMake: Fix Compiling Shader Builder on macOS #115929

Jeroen Bakker · 2023-12-08T10:29:42+01:00

Jeroen Bakker commented

2023-12-08 10:29:42 +01:00

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

a10ec0bc88 CMake: Revert Until shader_builder Runs Again

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

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.