Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guitargeek merged 1 commit into from
Oct 30, 2026
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions interpreter/cling/tools/plugins/clad/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,17 @@ endif()
# list(APPEND _clad_patches_list "patch1.patch" "patch2.patch")
#list(APPEND _clad_patches_list "nullptr_dereference_fix.patch" "windows_build_fix.patch")
list(APPEND _clad_patches_list "lld_lookup_no_default_path.patch")
if (_clad_patches_list)
# An external clad source directory is used as is: it is expected to be
# already patched if necessary, and it might be read-only or not a git
# repository, so the patches cannot be applied to it anyway.
if (_clad_patches_list AND NOT DEFINED CLAD_SOURCE_DIR)
set(_clad_patch_command
${CMAKE_COMMAND} -E copy_directory
${CMAKE_SOURCE_DIR}/interpreter/cling/tools/plugins/clad/patches <SOURCE_DIR>
&& git checkout -q <SOURCE_DIR>
&& git apply --ignore-space-change --ignore-whitespace ${_clad_patches_list}
)
endif(_clad_patches_list)
endif(_clad_patches_list AND NOT DEFINED CLAD_SOURCE_DIR)

ExternalProject_Add(
clad
Expand Down
Loading