| Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 1 | From 13ff43fe760ac343b33d8e8c84b89886aac07116 Mon Sep 17 00:00:00 2001 |
| 2 | From: Tom Hochstein <tom.hochstein@nxp.com> |
| 3 | Date: Fri, 3 Jun 2022 10:44:29 -0500 |
| 4 | Subject: [PATCH] cmake: Don't enable GLX if tests are disabled |
| 5 | |
| 6 | Allow building for systems that don't support GLX. |
| 7 | |
| 8 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/720] |
| 9 | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> |
| 10 | --- |
| 11 | CMakeLists.txt | 5 +---- |
| 12 | 1 file changed, 1 insertion(+), 4 deletions(-) |
| 13 | |
| 14 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 15 | index e1aeb5ddf..85e171aba 100644 |
| 16 | --- a/CMakeLists.txt |
| 17 | +++ b/CMakeLists.txt |
| 18 | @@ -134,10 +134,7 @@ if(PIGLIT_BUILD_CL_TESTS) |
| 19 | endif(PIGLIT_BUILD_CL_TESTS) |
| 20 | |
| 21 | IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") |
| 22 | - if(X11_FOUND AND OPENGL_gl_LIBRARY) |
| 23 | - # Assume the system has GLX. In the future, systems may exist |
| 24 | - # with libGL and libX11 but no GLX, but that world hasn't |
| 25 | - # arrived yet. |
| 26 | + if(X11_FOUND AND OPENGL_gl_LIBRARY AND PIGLIT_BUILD_GLX_TESTS) |
| 27 | set(PIGLIT_HAS_GLX True) |
| 28 | add_definitions(-DPIGLIT_HAS_GLX) |
| 29 | endif() |
| 30 | -- |
| 31 | 2.17.1 |
| 32 | |