Skip to content

[win] Fix git apply failures in incremental builds #22075

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

Open
bellenot wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −7
Open

[win] Fix git apply failures in incremental builds #22075

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion builtins/cfitsio/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ endif()
# flag required only on Windows, on old alma paltforms it make troubles
if(WIN32)
set(patch_args --ignore-whitespace)
# delete the source directory to make sure there is no conflict with the git apply command
execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory ${CFITSIO_PREFIX})
endif()

ExternalProject_Add(
Expand All @@ -48,7 +50,7 @@ ExternalProject_Add(
${CMAKE_CURRENT_SOURCE_DIR}/no-fortran-wrapper.diff
BUILD_COMMAND ${CMAKE_COMMAND} --build . ${CFITSIO_BUILD_COMMAND_FLAGS}
INSTALL_COMMAND ${CMAKE_COMMAND} --build . ${CFITSIO_BUILD_COMMAND_FLAGS} --target install
LOG_DOWNLOAD 1 LOG_CONFIGURE 1 LOG_BUILD 1 LOG_INSTALL 1 LOG_OUTPUT_ON_FAILURE 1
LOG_PATCH 1 LOG_DOWNLOAD 1 LOG_CONFIGURE 1 LOG_BUILD 1 LOG_INSTALL 1 LOG_OUTPUT_ON_FAILURE 1
BUILD_BYPRODUCTS ${CFITSIO_LIBRARIES}
TIMEOUT 600
)
Expand Down
8 changes: 3 additions & 5 deletions builtins/gl2ps/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ endif()
# flag required only on Windows, on old alma paltforms it make troubles
if(WIN32)
set(patch_args --ignore-whitespace)
# delete the source directory to make sure there is no conflict with the git apply command
execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory ${ROOT_GL2PS_PREFIX})
endif()

ExternalProject_Add(
Expand All @@ -46,11 +48,7 @@ ExternalProject_Add(
-DBUILD_SHARED_LIBS=OFF
BUILD_COMMAND ${CMAKE_COMMAND} --build . ${ROOT_GL2PS_BUILD_COMMAND_FLAGS}
INSTALL_COMMAND ${CMAKE_COMMAND} --build . ${ROOT_GL2PS_BUILD_COMMAND_FLAGS} --target install
LOG_DOWNLOAD 1
LOG_CONFIGURE 1
LOG_BUILD 1
LOG_INSTALL 1
LOG_OUTPUT_ON_FAILURE 1
LOG_PATCH 1 LOG_DOWNLOAD 1 LOG_CONFIGURE 1 LOG_BUILD 1 LOG_INSTALL 1 LOG_OUTPUT_ON_FAILURE 1
BUILD_BYPRODUCTS ${ROOT_GL2PS_LIBRARY}
TIMEOUT 600)

Expand Down
4 changes: 3 additions & 1 deletion builtins/libgif/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ endif()
# flag required only on Windows, on old alma paltforms it make troubles
if(WIN32)
set(patch_args --ignore-whitespace)
# delete the source directory to make sure there is no conflict with the git apply command
execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory ${ROOT_LIBGIF_PREFIX})
endif()

ExternalProject_Add(
Expand All @@ -43,7 +45,7 @@ ExternalProject_Add(
-DCMAKE_C_VISIBILITY_PRESET=hidden
BUILD_COMMAND ${CMAKE_COMMAND} --build . ${ROOT_LIBGIF_BUILD_COMMAND_FLAGS}
INSTALL_COMMAND ${CMAKE_COMMAND} --build . ${ROOT_LIBGIF_BUILD_COMMAND_FLAGS} --target install
LOG_CONFIGURE 1 LOG_BUILD 1 LOG_INSTALL 1 LOG_OUTPUT_ON_FAILURE 1
LOG_PATCH 1 LOG_CONFIGURE 1 LOG_BUILD 1 LOG_INSTALL 1 LOG_OUTPUT_ON_FAILURE 1
BUILD_BYPRODUCTS ${ROOT_LIBGIF_LIBRARY}
TIMEOUT 600
)
Expand Down
Loading