Skip to content
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

Jump to bottom

WIP: POC patch mechanism #422

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

WIP: POC patch mechanism #422

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
26 changes: 26 additions & 0 deletions cmake/schemes/url_sha1_cmake.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,31 @@ foreach(configuration ${configuration_types})
set(build_type_opts "-DCMAKE_CONFIGURATION_TYPES=${configuration}")
endif()

set(patch_command PATCH_COMMAND)
set(package_patch_dir "@HUNTER_PACKAGE_SETUP_DIR@/patches/@HUNTER_PACKAGE_VERSION@")
if(EXISTS ${package_patch_dir} AND IS_DIRECTORY ${package_patch_dir})
if(EXISTS ${package_patch_dir}/CMakeLists.txt)
list(APPEND patch_command
COMMAND ${CMAKE_COMMAND} -E copy ${package_patch_dir}/CMakeLists.txt @HUNTER_PACKAGE_SOURCE_DIR@
)
endif()
if(EXISTS ${package_patch_dir}/cmake AND IS_DIRECTORY ${package_patch_dir}/cmake)
list(APPEND patch_command
COMMAND ${CMAKE_COMMAND} -E copy_directory ${package_patch_dir}/cmake @HUNTER_PACKAGE_SOURCE_DIR@/cmake
)
endif()
file(GLOB package_patches ${package_patch_dir}/*.patch)
if(package_patches)
list(SORT package_patches)
include(hunter_get_git_executable)
hunter_get_git_executable(git_executable)
list(APPEND patch_command
COMMAND ${git_executable} --work-tree=. --git-dir=.git apply ${package_patches} --ignore-whitespace --whitespace=nowarn --verbose
WORKING_DIRECTORY @HUNTER_PACKAGE_SOURCE_DIR@
)
endif()
endif()

ExternalProject_Add(
"${current_project}"
URL
Expand All @@ -167,6 +192,7 @@ foreach(configuration ${configuration_types})
# not used, just avoid creating Install/<name> empty directory
SOURCE_SUBDIR
"@HUNTER_PACKAGE_SOURCE_SUBDIR@"
${patch_command}
BUILD_COMMAND
# Separate build and install stage so we can suppress install log
# which may consist of a long list of files
Expand Down