Mesa (staging/19.2): meson: split headers one per line
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Oct 11 18:23:33 UTC 2019
Module: Mesa
Branch: staging/19.2
Commit: 7f0d0ab83d4ef8bae9ef220a6d8a8026a94a74cd
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7f0d0ab83d4ef8bae9ef220a6d8a8026a94a74cd
Author: Eric Engestrom <eric.engestrom at intel.com>
Date: Mon Sep 30 14:00:51 2019 +0100
meson: split headers one per line
Fixes: 93df862b6affb6b8507e ("meson: re-add incorrect pkg-config files with GLVND for backward compatibility")
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
(cherry picked from commit daae003f471e7df222d5959f3ce1b3c709436579)
---
include/meson.build | 28 ++++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/include/meson.build b/include/meson.build
index d9b8df6ce52..082d8d66876 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -28,18 +28,26 @@ endif
if with_gles1
install_headers(
- 'GLES/egl.h', 'GLES/gl.h', 'GLES/glext.h', 'GLES/glplatform.h',
+ 'GLES/egl.h',
+ 'GLES/gl.h',
+ 'GLES/glext.h',
+ 'GLES/glplatform.h',
subdir : 'GLES',
)
endif
if with_gles2
install_headers(
- 'GLES2/gl2.h', 'GLES2/gl2ext.h', 'GLES2/gl2platform.h',
+ 'GLES2/gl2.h',
+ 'GLES2/gl2ext.h',
+ 'GLES2/gl2platform.h',
subdir : 'GLES2',
)
install_headers(
- 'GLES3/gl3.h', 'GLES3/gl31.h', 'GLES3/gl32.h', 'GLES3/gl3ext.h',
+ 'GLES3/gl3.h',
+ 'GLES3/gl31.h',
+ 'GLES3/gl32.h',
+ 'GLES3/gl3ext.h',
'GLES3/gl3platform.h',
subdir : 'GLES3',
)
@@ -47,19 +55,27 @@ endif
if with_opengl
install_headers(
- 'GL/gl.h', 'GL/glext.h', 'GL/glcorearb.h',
+ 'GL/gl.h',
+ 'GL/glcorearb.h',
+ 'GL/glext.h',
subdir : 'GL',
)
endif
if with_glx != 'disabled'
- install_headers('GL/glx.h', 'GL/glxext.h', subdir : 'GL')
+ install_headers(
+ 'GL/glx.h',
+ 'GL/glxext.h',
+ subdir : 'GL')
endif
if with_egl
install_headers(
- 'EGL/eglext.h', 'EGL/egl.h', 'EGL/eglextchromium.h', 'EGL/eglmesaext.h',
+ 'EGL/egl.h',
+ 'EGL/eglext.h',
'EGL/eglplatform.h',
+ 'EGL/eglmesaext.h',
+ 'EGL/eglextchromium.h',
subdir : 'EGL',
)
endif
More information about the mesa-commit
mailing list