From f4c03ad7a3bf7bacf900f59311fbc1112f948417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 19 Feb 2024 12:18:11 +0100 Subject: [PATCH] Put back #cmakedefine MAGNUM_TARGET_GLES3 into configure.h. The change in 87c7eea1e256c7ef1c53f1d0e2ec8b3e34bc3ae1 caused a breakage with old FindMagnum modules, which use if(MAGNUM_TARGET_GLES3) to decide if they should link to libGLES. This is now still only defined for deprecated builds, so non-deprecated builds with old FindMagnum will fail. --- src/Magnum/configure.h.cmake | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Magnum/configure.h.cmake b/src/Magnum/configure.h.cmake index abb56b1b3..0448bf835 100644 --- a/src/Magnum/configure.h.cmake +++ b/src/Magnum/configure.h.cmake @@ -62,12 +62,10 @@ #endif /* MAGNUM_TARGET_GLES3 used to be an inverse of MAGNUM_TARGET_GLES2 in an anticipation of there eventually being GLES 4. Used very rarely in the - internals and only led to confusion. Deliberate double space after the - #define to avoid being unconditionally matched by older FindMagnum - modules. */ -#if defined(MAGNUM_TARGET_GLES) && !defined(MAGNUM_TARGET_GLES2) -#define MAGNUM_TARGET_GLES3 -#endif + internals and only led to confusion. It's however still a cmakedefine so old + FindMagnum modules, which use it for linking OpenGLES3 libraries, can detect + and use it. */ +#cmakedefine MAGNUM_TARGET_GLES3 #endif #endif // kate: hl c++