Skip to content

[CMake] Do not patch clad when an external clad source directory is used - #23906

Merged
guitargeek merged 1 commit into
root-project:masterfrom
guitargeek:clad-patch
Oct 30, 2026
Merged

guitargeek merged 1 commit into
root-project:masterfrom
guitargeek:clad-patch

Conversation

@guitargeek

@guitargeek guitargeek commented Oct 30, 2026 •

Copy link
Copy Markdown
Contributor

An external clad source directory passed via CLAD_SOURCE_DIR is expected to be already patched if necessary. It might also be read-only or not a git repository, in which case the patch step with git checkout and git apply fails. So skip the patch step in this case.

This is a requirement for the ROOT nix package, where Clad is side-loaded via CLAD_SOURCE_DIR, because nix builds happen in a sandbox without internet connection.

To be backported to 6.42

An external clad source directory passed via CLAD_SOURCE_DIR is expected
to be already patched if necessary. It might also be read-only or not a
git repository, in which case the patch step with git checkout and git
apply fails. So skip the patch step in this case.
@guitargeek
guitargeek merged commit b6f66e5 into root-project:master Oct 30, 2026
30 of 33 checks passed
@guitargeek
guitargeek deleted the clad-patch branch October 30, 2026 11:13
@guitargeek

Copy link
Copy Markdown
Contributor Author

/backport to 6.42

@root-project-bot

Copy link
Copy Markdown

Preparing to backport PR #23906 to branch 6.42 requested by guitargeek

@root-project-bot

Copy link
Copy Markdown

This PR has been backported to branch 6.42: #23912

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants