[Piglit] [PATCH 1/2] cmake: use the EGL_CFLAGS_OTHER

Emil Velikov emil.l.velikov at gmail.com
Fri Feb 12 02:14:12 UTC 2016


On 12 February 2016 at 01:43, Dylan Baker <baker.dylan.c at gmail.com> wrote:
> Quoting Mircea Gherzan (2016-02-11 15:22:48)
>> Without them, the build will fail on a system without the X headers with
>> a recent Mesa from the master branch. The EGL_CFLAGS_OTHER define the
>> MESA_EGL_NO_X11_HEADERS macro that guards the #includes of the X
>> headers.
>>
>> Signed-off-by: Mircea Gherzan <mircea.gherzan at intel.com>
>> ---
>>  CMakeLists.txt | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/CMakeLists.txt b/CMakeLists.txt
>> index b822934..6a201b8 100644
>> --- a/CMakeLists.txt
>> +++ b/CMakeLists.txt
>> @@ -402,6 +402,7 @@ endif()
>>  if(EGL_FOUND)
>>         add_definitions(-DPIGLIT_HAS_EGL)
>>         include_directories(${EGL_INCLUDE_DIRS})
>> +       add_definitions (${EGL_CFLAGS_OTHER})
>>  endif()
>>
>>  if(PIGLIT_BUILD_GLES1_TESTS AND NOT EGL_FOUND)
>> --
>> 2.5.0
>>
>> _______________________________________________
>> Piglit mailing list
>> Piglit at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/piglit
>
> I'm definitely not an authority here, but why does an EGL extension test
> rely on X?
>
>From slightly different perspective -> EGL (Embedded...) headers
include platform specific types which map to the opaque
EGLNative{Window,Pixmap,Display}Type. So for X it maps to Pixmap,
Window, Display *, for Android - ANativeWindow, ... and so on.

Ideally there would have been a "USE_VOIDPTR_FOR_NATIVE_TYPES" kind of
define, but that never made it ;-(

As mesa is built without X the said define finds its way into the
egl.pc and cmake picks it up with the said command.

-Emil


More information about the Piglit mailing list