Skip to content

[cmake] special git patch args for Windows #21930

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

Merged
linev merged 1 commit into from
Apr 17, 2026
+19 −5
Merged

[cmake] special git patch args for Windows #21930

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
7 changes: 6 additions & 1 deletion builtins/cfitsio/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ if(WIN32 AND NOT CMAKE_GENERATOR MATCHES Ninja)
endif()
endif()

# flag required only on Windows, on old alma paltforms it make troubles
if(WIN32)
set(patch_args --ignore-whitespace)
endif()

Comment thread
linev marked this conversation as resolved.
ExternalProject_Add(
BUILTIN_CFITSIO
PREFIX ${CFITSIO_PREFIX}
Expand All @@ -38,7 +43,7 @@ ExternalProject_Add(
-DZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIRS}
-DZLIB_LIBRARIES=$<TARGET_FILE:ZLIB::ZLIB>
# Skip the find_package(ZLIB REQUIRED), because we feed CFITSIO our own ZLIB flags.
PATCH_COMMAND git apply --ignore-space-change --ignore-whitespace
PATCH_COMMAND git apply ${patch_args}
${CMAKE_CURRENT_SOURCE_DIR}/cfitsio-no-find-zlib.diff
${CMAKE_CURRENT_SOURCE_DIR}/no-fortran-wrapper.diff
BUILD_COMMAND ${CMAKE_COMMAND} --build . ${CFITSIO_BUILD_COMMAND_FLAGS}
Expand Down
10 changes: 7 additions & 3 deletions builtins/gl2ps/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ set(ROOT_GL2PS_PATCH_FILE ${CMAKE_CURRENT_SOURCE_DIR}/v142_post_tag_fixes.patch)

set(ROOT_GL2PS_PREFIX ${CMAKE_BINARY_DIR}/builtins/GL2PS-prefix)

set(ROOT_GL2PS_LIBRARY ${ROOT_GL2PS_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gl2ps${CMAKE_STATIC_LIBRARY_SUFFIX}
)
set(ROOT_GL2PS_LIBRARY ${ROOT_GL2PS_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gl2ps${CMAKE_STATIC_LIBRARY_SUFFIX})

if(WIN32 AND NOT CMAKE_GENERATOR MATCHES Ninja)
if(winrtdebug)
Expand All @@ -25,12 +24,17 @@ if(WIN32 AND NOT CMAKE_GENERATOR MATCHES Ninja)
endif()
endif()

# flag required only on Windows, on old alma paltforms it make troubles
if(WIN32)
set(patch_args --ignore-whitespace)
endif()

ExternalProject_Add(
BUILTIN_GL2PS
PREFIX ${ROOT_GL2PS_PREFIX}
URL ${lcgpackages}/gl2ps-${ROOT_GL2PS_VERSION}.tgz
URL_HASH SHA256=${ROOT_GL2PS_HASH}
PATCH_COMMAND git apply ${ROOT_GL2PS_PATCH_FILE}
PATCH_COMMAND git apply ${patch_args} ${ROOT_GL2PS_PATCH_FILE}
CMAKE_ARGS -G ${CMAKE_GENERATOR}
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
Expand Down
7 changes: 6 additions & 1 deletion builtins/libgif/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,17 @@ if(WIN32 AND NOT CMAKE_GENERATOR MATCHES Ninja)
endif()
endif()

# flag required only on Windows, on old alma paltforms it make troubles
if(WIN32)
set(patch_args --ignore-whitespace)
endif()

ExternalProject_Add(
BUILTIN_LIBGIF
PREFIX ${ROOT_LIBGIF_PREFIX}
URL ${lcgpackages}/giflib-${ROOT_LIBGIF_VERSION}.tar.gz
URL_HASH SHA256=${ROOT_LIBGIF_HASH}
PATCH_COMMAND git apply ${ROOT_LIBGIF_PATCH_FILE}
PATCH_COMMAND git apply ${patch_args} ${ROOT_LIBGIF_PATCH_FILE}
CMAKE_ARGS -G ${CMAKE_GENERATOR}
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
Expand Down
Loading