diff options
| author | Emil Velikov <[email protected]> | 2018-12-12 17:47:36 +0000 |
|---|---|---|
| committer | Juan A. Suarez Romero <[email protected]> | 2018-12-25 17:58:06 +0100 |
| commit | 0d692a5b54bef1cee1665f0cc94d72ffb8243cd4 (patch) | |
| tree | 163ec93a7255606950e31c58639d82c8189ed2d2 /src | |
| parent | 00fda84bff46508bebd14185e82bd4276783ccb7 (diff) | |
TODO: glx: meson: build dri based glx tests, only with -Dglx=dri
The library itself (libGL) is only built when -Dglx=dri, yet it's
accompanying tests are build even with -Dglx=xlib.
Adjust the guards, so we don't build the tests when they are not
applicable
v2:
- Reword commit message (Dylan)
- Drop build_by_default hunk (Dylan)
Fixes: a47c525f328 ("meson: build glx")
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Dylan Baker <[email protected]>
(cherry picked from commit 9527f9ea2611b0793377016c8c16ec58ded7f287)
Diffstat (limited to 'src')
| -rw-r--r-- | src/glx/meson.build | 33 | ||||
| -rw-r--r-- | src/meson.build | 2 |
2 files changed, 16 insertions, 19 deletions
diff --git a/src/glx/meson.build b/src/glx/meson.build index f3bbcb433ad..6bd3e462656 100644 --- a/src/glx/meson.build +++ b/src/glx/meson.build @@ -150,26 +150,23 @@ libglx = static_library( extra_libs_libglx, ], dependencies : [dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_glvnd], - build_by_default : false, ) -if with_glx == 'dri' - libgl = shared_library( - gl_lib_name, - [], - include_directories : [inc_common, inc_glapi, inc_loader, inc_gl_internal], - link_with : [libglapi_static, libglapi], - link_whole : libglx, - link_args : [ld_args_bsymbolic, ld_args_gc_sections, extra_ld_args_libgl], - dependencies : [ - dep_libdrm, dep_dl, dep_m, dep_thread, dep_x11, dep_xcb_glx, dep_xcb, - dep_x11_xcb, dep_xcb_dri2, dep_xext, dep_xfixes, dep_xdamage, dep_xxf86vm, - extra_deps_libgl, - ], - version : gl_lib_version, - install : true, - ) -endif +libgl = shared_library( + gl_lib_name, + [], + include_directories : [inc_common, inc_glapi, inc_loader, inc_gl_internal], + link_with : [libglapi_static, libglapi], + link_whole : libglx, + link_args : [ld_args_bsymbolic, ld_args_gc_sections, extra_ld_args_libgl], + dependencies : [ + dep_libdrm, dep_dl, dep_m, dep_thread, dep_x11, dep_xcb_glx, dep_xcb, + dep_x11_xcb, dep_xcb_dri2, dep_xext, dep_xfixes, dep_xdamage, dep_xxf86vm, + extra_deps_libgl, + ], + version : gl_lib_version, + install : true, +) if with_tests subdir('tests') diff --git a/src/meson.build b/src/meson.build index 5cfc4f9d5f6..0d524bad960 100644 --- a/src/meson.build +++ b/src/meson.build @@ -71,7 +71,7 @@ subdir('loader') if with_platform_haiku subdir('hgl') endif -if with_glx != 'disabled' +if with_glx == 'dri' subdir('glx') endif if with_gbm |