Skip to content

Commit 836cf1a

Browse files
authored
[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.
1 parent a9cc13f commit 836cf1a

5 files changed

Lines changed: 5 additions & 5 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/ftgl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ if (NOT DEFINED GIT_EXECUTABLE)
2828
endif()
2929

3030
if(NOT EXISTS "${ROOT_FTGL_PREFIX}/src/BUILTIN_FTGL/._patched")
31-
set(ROOT_FTGL_PATCH_COMMAND PATCH_COMMAND ${GIT_EXECUTABLE} apply --ignore-space-change --ignore-whitespace
31+
set(ROOT_FTGL_PATCH_COMMAND PATCH_COMMAND ${GIT_EXECUTABLE} init COMMAND ${GIT_EXECUTABLE} apply --ignore-space-change --ignore-whitespace
3232
${ROOT_FTGL_PATCH_FILE_1}
3333
${ROOT_FTGL_PATCH_FILE_2}
3434
${ROOT_FTGL_PATCH_FILE_3}

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(

builtins/xxhash/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if (NOT DEFINED GIT_EXECUTABLE)
2020
endif()
2121
# check if the patch has already been applied
2222
if(NOT EXISTS "${ROOT_XXHASH_PREFIX}/src/BUILTIN_XXHASH/CMakeLists.txt")
23-
set(XXHASH_PATCH_COMMAND PATCH_COMMAND ${GIT_EXECUTABLE} apply --ignore-space-change --ignore-whitespace ${ROOT_XXHASH_PATCH_FILE})
23+
set(XXHASH_PATCH_COMMAND PATCH_COMMAND ${GIT_EXECUTABLE} init COMMAND ${GIT_EXECUTABLE} apply --ignore-space-change --ignore-whitespace ${ROOT_XXHASH_PATCH_FILE})
2424
endif()
2525

2626
set(ROOT_XXHASH_LIBRARY ${ROOT_XXHASH_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}xxhash${CMAKE_STATIC_LIBRARY_SUFFIX})

0 commit comments

Comments
 (0)