Demos (cmake): cmake: oglinfo requires X11.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Sat Nov 6 13:12:20 UTC 2010


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

Author: José Fonseca <jfonseca at vmware.com>
Date:   Sat Nov  6 13:08:38 2010 +0000

cmake: oglinfo requires X11.

---

 src/samples/CMakeLists.txt |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/src/samples/CMakeLists.txt b/src/samples/CMakeLists.txt
index 9fb9f46..b0dcb95 100644
--- a/src/samples/CMakeLists.txt
+++ b/src/samples/CMakeLists.txt
@@ -32,7 +32,6 @@ set (targets
 	line
 	logo
 	nurb
-	oglinfo
 	olympic
 	overlay
 	point
@@ -55,3 +54,23 @@ foreach (target ${targets})
 endforeach (target)
 
 install (TARGETS ${targets} DESTINATION samples)
+
+if (X11_FOUND)
+	include_directories (
+		${X11_INCLUDE_DIR}
+	)
+
+	link_libraries (
+		${X11_X11_LIBRARY}
+	)
+
+	set (xtargets
+		oglinfo
+	)
+
+	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