Skip to content

Commit 7e2a756

Browse files
will-cernguitargeek
authored andcommitted
[CMake] Init git before patches to ensure correct paths of patched files
This fixes issue where the build directory is somewhere underneath a git repository, which affects `git apply` behaviour. This is commit 836cf1a from master, partially applied.
1 parent cd17c50 commit 7e2a756

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

builtins/cfitsio/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if(WIN32)
2727
endif()
2828

2929
if(NOT EXISTS "${CFITSIO_PREFIX}/src/BUILTIN_CFITSIO/._patched")
30-
set(CFITSIO_PATCH_COMMAND PATCH_COMMAND git apply ${patch_args}
30+
set(CFITSIO_PATCH_COMMAND PATCH_COMMAND git init COMMAND git apply ${patch_args}
3131
${CMAKE_CURRENT_SOURCE_DIR}/cfitsio-no-find-zlib.diff
3232
${CMAKE_CURRENT_SOURCE_DIR}/no-fortran-wrapper.diff
3333
${CMAKE_CURRENT_SOURCE_DIR}/cfitsio-marker.diff)

builtins/gl2ps/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ endif()
3131

3232
# check if the patch has already been applied
3333
if(NOT EXISTS "${ROOT_GL2PS_PREFIX}/src/BUILTIN_GL2PS/._patched")
34-
set(GL2PS_PATCH_COMMAND PATCH_COMMAND git apply ${patch_args} ${ROOT_GL2PS_PATCH_FILES})
34+
set(GL2PS_PATCH_COMMAND PATCH_COMMAND git init COMMAND git apply ${patch_args} ${ROOT_GL2PS_PATCH_FILES})
3535
endif()
3636

3737
ExternalProject_Add(

builtins/libgif/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ endif()
3030

3131
# check if the patch has already been applied
3232
if(NOT EXISTS "${ROOT_LIBGIF_PREFIX}/src/BUILTIN_LIBGIF/CMakeLists.txt")
33-
set(LIBGIF_PATCH_COMMAND PATCH_COMMAND git apply ${patch_args} ${ROOT_LIBGIF_PATCH_FILE})
33+
set(LIBGIF_PATCH_COMMAND PATCH_COMMAND git init COMMAND git apply ${patch_args} ${ROOT_LIBGIF_PATCH_FILE})
3434
endif()
3535

3636
ExternalProject_Add(

0 commit comments

Comments
 (0)