Demos (cmake): cmake: Some tests require X11.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Fri Nov 5 20:14:01 UTC 2010


Module: Demos
Branch: cmake
Commit: 57d5037b5ac3fefed0be544ac78f12b84eadf5c7
URL:    http://cgit.freedesktop.org/mesa/demos/commit/?id=57d5037b5ac3fefed0be544ac78f12b84eadf5c7

Author: José Fonseca <jfonseca at vmware.com>
Date:   Fri Nov  5 20:13:40 2010 +0000

cmake: Some tests require X11.

---

 src/tests/CMakeLists.txt |   28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index a7f4423..72105ab 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -34,7 +34,6 @@ set (targets
 	arbvptorus
 	arbvpwarpmesh
 	arraytexture
-	auxbuffer
 	blendxor
 	blitfb
 	bufferobj
@@ -70,7 +69,6 @@ set (targets
 	glutfx
 	interleave
 	invert
-	jkrahntest
 	lineclip
 	manytex
 	mapbufrange
@@ -99,7 +97,6 @@ set (targets
 	scissor-viewport
 	seccolor
 	shader_api
-	sharedtex
 	stencilreaddraw
 	stencilwrap
 	streaming_rect
@@ -115,7 +112,6 @@ set (targets
 	texleak
 	texline
 	texobj
-	texobjshare
 	texrect
 	texwrap
 	unfilledclip
@@ -139,3 +135,27 @@ foreach (target ${targets})
 endforeach (target)
 
 install (TARGETS ${targets} DESTINATION tests)
+
+if (X11_FOUND)
+	include_directories (
+		${X11_INCLUDE_DIR}
+	)
+
+	link_libraries (
+		${X11_X11_LIBRARY}
+	)
+
+	set (xtargets
+		auxbuffer
+		jkrahntest
+		sharedtex
+		texobjshare
+	)
+
+	foreach (xtarget ${xtargets})
+		add_executable (${xtarget} ${xtarget}.c)
+	endforeach (xtarget)
+
+	install (TARGETS ${xtargets} DESTINATION tests)
+endif (X11_FOUND)
+




More information about the mesa-commit mailing list