OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: skip installation of GLVND-provided headers

Browse Source 
Fixes: 93df862b6a ("meson: re-add incorrect pkg-config files with GLVND for backward compatibility")
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/1846
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
This commit is contained in:
Eric Engestrom
2019-09-30 14:08:29 +01:00
parent 1a7e9652c4
commit 34ba363ab0
1 changed files with 51 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/meson.build
View File

@@ -22,6 +22,7 @@ inc_include = include_directories('.')
inc_d3d9 = include_directories('D3D9') inc_d3d9 = include_directories('D3D9')
inc_haikugl = include_directories('HaikuGL') inc_haikugl = include_directories('HaikuGL')
if not glvnd_has_headers_and_pc_files
if with_gles1 or with_gles2 or with_opengl or with_egl if with_gles1 or with_gles2 or with_opengl or with_egl
install_headers('KHR/khrplatform.h', subdir : 'KHR') install_headers('KHR/khrplatform.h', subdir : 'KHR')
endif endif
@@ -77,6 +78,7 @@ if with_egl
subdir : 'EGL', subdir : 'EGL',
) )
endif endif
endif
# Non-upstream headers # Non-upstream headers
if with_egl if with_egl