Skip to content

build(cmake): prefer system dependencies over FetchContent#197

Merged
fbraz3 merged 4 commits into
fbraz3:mainfrom
AuroraRAS:main
Jul 11, 2026
Merged

build(cmake): prefer system dependencies over FetchContent#197
fbraz3 merged 4 commits into
fbraz3:mainfrom
AuroraRAS:main

Conversation

@AuroraRAS

Copy link
Copy Markdown
  • Modify CMake scripts (CURL, miniaudio, OpenAL, SDL3) to check for system packages before falling back to FetchContent
  • Update Linux documentation to include SDL3_image-devel
  • Adjust deployment scripts to handle optional SDL3 library paths and support diverse FFmpeg paths across Linux distributions

- Modify CMake scripts (CURL, miniaudio, OpenAL, SDL3) to check for
  system packages before falling back to FetchContent
- Update Linux documentation to include SDL3_image-devel
- Adjust deployment scripts to handle optional SDL3 library paths
  and support diverse FFmpeg paths across Linux distributions
@fbraz3

fbraz3 commented Jul 10, 2026

Copy link
Copy Markdown
Owner

Thanks for the PR.

Originally I was working on Ubuntu 24.04 which does not have the SDL3 package, so the solution was downloading it at compilation time.

Since the latest LTS does have the packages, your approach makes more sense.

@fbraz3

fbraz3 commented Jul 10, 2026

Copy link
Copy Markdown
Owner

@AuroraRAS can you please fix the build pipeline? thanks!

@fbraz3 fbraz3 self-requested a review July 10, 2026 23:48
Add operating system detection to the CMake files to prevent `find_package` from affecting other operating systems.
I have updated both flatpak/com.fbraz3.GeneralsXZH.yml and flatpak/com.fbraz3.GeneralsX.yml. I changed the hardcoded cp commands for sdl3, sdl3_image, and openal_soft to be conditional.
@AuroraRAS

Copy link
Copy Markdown
Author

@AuroraRAS can you please fix the build pipeline? thanks!

My environment lacks Flatpak, so I couldn't complete the testing locally, but I suspect I've fixed the issue.

@fbraz3 fbraz3 merged commit 200c35d into fbraz3:main Jul 11, 2026
8 checks passed
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.

2 participants