Skip to content

Commit

Permalink
Revert "Add git checkout before patching."
Browse files Browse the repository at this point in the history
This reverts commit c614081.

This is no longer necessary because of UDPATE_DISCONNECTED, which will
make the download step act more like using a URL instead of a
GIT_REPOSITORY.

Signed-off-by: Scott K Logan <[email protected]>
  • Loading branch information
cottsay committed Feb 1, 2021
1 parent d5db9f9 commit 3af6812
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ macro(build_uncrustify)
${extra_cmake_args}
-Wno-dev
PATCH_COMMAND
${CMAKE_COMMAND} -E chdir <SOURCE_DIR> git checkout -q . && ${CMAKE_COMMAND} -E chdir <SOURCE_DIR> git apply -p1 --ignore-space-change --whitespace=nowarn ${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

0 comments on commit 3af6812

Please sign in to comment.