summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Heidelberg <david.heidelberg@collabora.com>2024-03-31 19:37:24 +0200
committerMarge Bot <emma+marge@anholt.net>2024-04-12 12:05:54 +0000
commit4319b9fc84d3f98f73e7dedb51fbe12945058a57 (patch)
treedd78e5c67bdd1b949f485f28fe1f4b56f1c26f38
parent44e1c29bf6b1e470e93ef12f4517c0981df47ace (diff)
cmake: move GLX and WGL option to the beggining of the file
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/898>
-rw-r--r--CMakeLists.txt16
1 files changed, 3 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0291f5ff4..ff6846fcd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,6 +54,9 @@ option(PIGLIT_SSE2 "Build with SSE2 support on 32-bit x86 architecture" ON)
option(PIGLIT_USE_WAFFLE "Use Waffle in place of GLUT" ${DEFAULT_WAFFLE})
+option(PIGLIT_BUILD_GLX_TESTS "Build tests that require GLX" ${DEFAULT_GLX})
+option(PIGLIT_BUILD_WGL_TESTS "Build tests that require WGL" ${DEFAULT_WGL})
+
option(PIGLIT_BUILD_GL_TESTS "Build tests for OpenGL" ON)
option(PIGLIT_BUILD_GLES1_TESTS "Build tests for OpenGL ES1" ${DEFAULT_GLES_TESTS_BUILD})
option(PIGLIT_BUILD_GLES2_TESTS "Build tests for OpenGL ES2" ${DEFAULT_GLES_TESTS_BUILD})
@@ -208,19 +211,6 @@ if(PIGLIT_BUILD_VK_TESTS)
endif()
endif(PIGLIT_BUILD_VK_TESTS)
-IF(PIGLIT_HAS_GLX)
- option(PIGLIT_BUILD_GLX_TESTS "Build tests that require GLX" ON)
-ELSE()
- option(PIGLIT_BUILD_GLX_TESTS "Build tests that require GLX" OFF)
-ENDIF()
-
-IF(PIGLIT_HAS_WGL)
- option(PIGLIT_BUILD_WGL_TESTS "Build tests that require WGL" ON)
-ELSE()
- option(PIGLIT_BUILD_WGL_TESTS "Build tests that require WGL" OFF)
-ENDIF()
-
-
# Choose to build tests that use dma_buf.
#
# Piglit's dma_buf utilities require xcb-dri2 to gain DRM authentication, and