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

Switch to applying patch with git apply. #15

Merged
merged 1 commit into from
Dec 23, 2020
Merged

Switch to applying patch with git apply. #15

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
3 changes: 1 addition & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ macro(build_uncrustify)
endif()

include(ExternalProject)
find_package(Patch REQUIRED)

# Pinning to tip of master at the time of a desired bugfix
set(uncrustify_version 45b836cff040594994d364ad6fd3f04adc890a26)
Expand All @@ -52,7 +51,7 @@ macro(build_uncrustify)
${extra_cmake_args}
-Wno-dev
PATCH_COMMAND
${Patch_EXECUTABLE} -p1 -N < ${CMAKE_CURRENT_SOURCE_DIR}/install-patch.diff
${CMAKE_COMMAND} -E chdir <SOURCE_DIR> git apply -p1 --ignore-space-change --whitespace=nowarn ${CMAKE_CURRENT_SOURCE_DIR}/install-patch.diff
)

# The external project will install to the build folder, but we'll install that on make install.
Expand Down