From 09941b5d8dd32cf28deafaecc0ee21dbe034595e Mon Sep 17 00:00:00 2001 From: Michael Baetgen Date: Mon, 10 Nov 2025 23:17:57 -0600 Subject: [PATCH] use cmake built-in FindOpenGL module for GLES with cmake 3.23+ --- CMakeLists.txt | 6 ++++-- src/libprojectM/projectM4Config.cmake.in | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f4c624e549..5a1e691426 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -169,8 +169,10 @@ else() message(FATAL_ERROR "OpenGL ES 3 support is currently only available for Linux platforms. You're building for ${CMAKE_SYSTEM_NAME}.") endif() - # We use a local find script for OpenGL::GLES3 until the proposed changes are merged upstream. - list(APPEND CMAKE_MODULE_PATH "${PROJECTM_SOURCE_DIR}/cmake/gles") + if (CMAKE_VERSION VERSION_LESS_EQUAL "3.22" OR CMAKE_SYSTEM_NAME STREQUAL Android) + # We use a local find script for OpenGL::GLES3 until the proposed changes are merged upstream. + list(APPEND CMAKE_MODULE_PATH "${PROJECTM_SOURCE_DIR}/cmake/gles") + endif() find_package(OpenGL REQUIRED COMPONENTS GLES3) if(NOT TARGET OpenGL::GLES3) message(FATAL_ERROR "No suitable GLES3 library was found.") diff --git a/src/libprojectM/projectM4Config.cmake.in b/src/libprojectM/projectM4Config.cmake.in index 00244c4dff..1ca733c9c7 100644 --- a/src/libprojectM/projectM4Config.cmake.in +++ b/src/libprojectM/projectM4Config.cmake.in @@ -6,7 +6,9 @@ include(CMakeFindDependencyMacro) if(NOT "@ENABLE_EMSCRIPTEN@") # ENABLE_EMSCRIPTEN if("@ENABLE_GLES@") # ENABLE_GLES - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + if (CMAKE_VERSION VERSION_LESS_EQUAL "3.22" OR CMAKE_SYSTEM_NAME STREQUAL Android) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + endif() find_dependency(OpenGL COMPONENTS GLES3) else() find_dependency(OpenGL)