Skip to content

Conversation

@mbaetgen-wup
Copy link
Collaborator

No description provided.

@mbaetgen-wup mbaetgen-wup force-pushed the cmake-version-check-gles branch from bae1912 to 2a79f95 Compare November 11, 2025 04:59
@mbaetgen-wup mbaetgen-wup force-pushed the cmake-version-check-gles branch from 2a79f95 to f86ffa5 Compare November 11, 2025 05:18
@mbaetgen-wup mbaetgen-wup changed the title use cmake built-in FindOpenGL module for cmake 3.23+ use built-in FindOpenGL module for GLES with cmake 3.23+ Nov 11, 2025
@kblaschke
Copy link
Member

kblaschke commented Nov 11, 2025

Probably needs to be done in the same way in the config package script here. I also always forget about this file, as seen in the 4.1.6 PR 😆

Guess you could also squash the changes into a single commit before merging, as it's only a few lines.

Copy link
Member

@kblaschke kblaschke left a comment

Choose a reason for hiding this comment

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

Please also add the version check conditional around the same line in the CMake package config file.

kblaschke and others added 3 commits November 11, 2025 15:18
The new combined function no longer returns the image size, so we need to load the image ourselves, store the size and then pass the buffer to SOIL_create_OGL_texture().
@mbaetgen-wup mbaetgen-wup force-pushed the cmake-version-check-gles branch from ecfb4c8 to 09941b5 Compare November 13, 2025 05:16
Copy link
Member

@kblaschke kblaschke left a comment

Choose a reason for hiding this comment

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

Just two small details left.

mbaetgen-wup and others added 6 commits November 15, 2025 16:36
Co-authored-by: Kai Blaschke <kai.blaschke@kb-dev.net>
…make-version-check-gles

# Conflicts:
#	src/libprojectM/projectM4Config.cmake.in
Co-authored-by: Kai Blaschke <kai.blaschke@kb-dev.net>
@mbaetgen-wup mbaetgen-wup changed the title use built-in FindOpenGL module for GLES with cmake 3.23+ use built-in FindOpenGL module for GLES with cmake 3.27+ Dec 15, 2025
@kblaschke
Copy link
Member

If your changes are ready for review, just hit the "Re-request review" button, I'll then do a final check. Already looking good though.

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