Skip to content

Update CMakeLists.txt - ensure ftgl patches are relative to correct d…#22419

Open
will-cern wants to merge 2 commits into
root-project:masterfrom
will-cern:patch-19
Open

Update CMakeLists.txt - ensure ftgl patches are relative to correct d…#22419
will-cern wants to merge 2 commits into
root-project:masterfrom
will-cern:patch-19

Conversation

@will-cern
Copy link
Copy Markdown
Contributor

…irectory

this fixes issue where the build dir is somewhere underneath a git repo, which affects git apply behaviour

This Pull request:

Changes or fixes:

fixes issue discussed @ #21898 (comment)

Checklist:

  • [ x] tested changes locally
  • updated the docs (if necessary)

This PR fixes #

…irectory

this fixes issue where the build dir is somewhere underneath a git repo, which affects `git apply` behaviour
@will-cern will-cern requested a review from bellenot as a code owner May 28, 2026 15:53
@ferdymercury
Copy link
Copy Markdown
Collaborator

ferdymercury commented May 28, 2026

Thanks! If this change is not harmful even if not needed on some OS or platforms, we should maybe change it the same way in all the other places, too?

builtins/cfitsio/CMakeLists.txt
builtins/ftgl/CMakeLists.txt
builtins/gl2ps/CMakeLists.txt
builtins/libgif/CMakeLists.txt
builtins/xxhash/CMakeLists.txt

Fixes #22415

@ferdymercury ferdymercury requested review from dpiparo and linev May 28, 2026 15:59
@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 28, 2026

Test Results

    22 files      22 suites   3d 11h 15m 14s ⏱️
 3 863 tests  1 734 ✅ 0 💤 2 129 ❌
76 179 runs  74 050 ✅ 0 💤 2 129 ❌

For more details on these failures, see this check.

Results for commit f5d4b90.

♻️ This comment has been updated with latest results.

@will-cern
Copy link
Copy Markdown
Contributor Author

Indeed. In fact, I guess for our builds these patches may have been silently not being applied! I've now fixed the builtins you mentioned

Copy link
Copy Markdown
Collaborator

@ferdymercury ferdymercury left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

Copy link
Copy Markdown
Contributor

@guitargeek guitargeek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants