Skip to content

Fix apply_patches in CMake to work with two directories #675

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
wenju-he merged 1 commit into from
Apr 2, 2026
Merged

Fix apply_patches in CMake to work with two directories #675

Show file tree
Hide file tree
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
9 changes: 4 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,13 @@ if(NOT USE_PREBUILT_LLVM)
set(SPIRV_BASE_REVISION llvm_release_150)
set(TARGET_BRANCH "ocl-open-150")
get_filename_component(LLVM_MONOREPO_DIR ${LLVM_SOURCE_DIR} DIRECTORY)
set(LLVM_PATCHES_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm
${CMAKE_CURRENT_SOURCE_DIR}/patches/clang)

if(APPLY_PATCHES)
message(STATUS "APPLY_PATCHES is enabled.")
apply_patches(${LLVM_MONOREPO_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm
${LLVM_BASE_REVISION}
${TARGET_BRANCH})
apply_patches(${LLVM_MONOREPO_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/patches/clang
"${LLVM_PATCHES_DIRS}"
${LLVM_BASE_REVISION}
${TARGET_BRANCH})
apply_patches(${SPIRV_SOURCE_DIR}
Expand Down
14 changes: 8 additions & 6 deletions cmake/modules/CMakeFunctions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,18 @@ endfunction()

#
# Creates `target_branch` starting at the `base_revision` in the `repo_dir`.
# Then all patches from the `patches_dir` are committed to the `target_branch`.
# Then all patches from the `patches_dirs` are committed to the `target_branch`.
# `patches_dirs` can be a single directory or a semicolon-separated list.
# Does nothing if the `target_branch` is already checked out in the `repo_dir`.
#
function(apply_patches repo_dir patches_dir base_revision target_branch)
foreach(patches_dir ${patches_dir})
file(GLOB patches_in_dir ${patches_dir}/*.patch)
list(APPEND patches ${patches_in_dir})
function(apply_patches repo_dir patches_dirs base_revision target_branch)
set(patches)
foreach(dir ${patches_dirs})
file(GLOB dir_patches ${dir}/*.patch)
list(APPEND patches ${dir_patches})
endforeach()
if(NOT patches)
message(STATUS "[OPENCL-CLANG] No patches in ${patches_dir}")
message(STATUS "[OPENCL-CLANG] No patches in ${patches_dirs}")
return()
endif()

Expand Down
Loading