Demos (master): cmake: Build more egl/opengl samples .

Jose Fonseca jrfonseca at kemper.freedesktop.org
Thu Nov 10 07:01:07 UTC 2011


Module: Demos
Branch: master
Commit: 73d91dce17aa42dc1126aa28cef300ed40bad38e
URL:    http://cgit.freedesktop.org/mesa/demos/commit/?id=73d91dce17aa42dc1126aa28cef300ed40bad38e

Author: José Fonseca <jose.r.fonseca at gmail.com>
Date:   Thu Nov 10 06:57:02 2011 +0000

cmake: Build more egl/opengl samples .

---

 src/egl/opengl/CMakeLists.txt |   57 +++++++++++++++++++++++++++++++++--------
 1 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/src/egl/opengl/CMakeLists.txt b/src/egl/opengl/CMakeLists.txt
index 8883bbb..854f64a 100644
--- a/src/egl/opengl/CMakeLists.txt
+++ b/src/egl/opengl/CMakeLists.txt
@@ -1,20 +1,55 @@
-include_directories(${EGL_INCLUDE_DIR}
-  ../eglut
-  ../../util
-  )
+include_directories(
+	${CMAKE_SOURCE_DIR}/src/egl/eglut
+	${CMAKE_SOURCE_DIR}/src/util
+	${EGL_INCLUDE_DIR}
+	${OPENGL_INCLUDE_PATH}
+)
 
 link_libraries (
 	${EGL_egl_LIBRARY}
 	${OPENGL_gl_LIBRARY}
 )
 
-add_executable(eglinfo eglinfo.c)
+set (subdir egl)
+
+set (targets
+	demo1
+	demo2
+	demo3
+)
+
+foreach (target ${targets})
+	add_executable (${subdir}_${target} ${target}.c)
+	set_target_properties (${subdir}_${target} PROPERTIES OUTPUT_NAME ${target})
+	install (TARGETS ${subdir}_${target} DESTINATION ${subdir})
+endforeach (target)
+
+
+# Targets that can be built both for fullscreen EGL and X11
+
+set (targets
+	egltri
+	eglgears
+)
+
+foreach (target ${targets})
+	add_executable (${target}_screen ${target}.c)
+	target_link_libraries (${target}_screen eglut_screen)
+	install (TARGETS ${target}_screen DESTINATION ${subdir})
+
+	if (X11_FOUND)
+		add_executable (${target}_x11 ${target}.c)
+		target_link_libraries (${target}_x11 eglut_x11)
+		install (TARGETS ${target}_x11 DESTINATION ${subdir})
+	endif ()
+endforeach (target)
+
 
-add_executable(eglgears_screen eglgears.c)
-target_link_libraries(eglgears_screen eglut_screen)
+if (X11_FOUND)
+	add_executable (xeglgears xeglgears.c)
+	target_link_libraries (xeglgears ${X11_X11_LIB})
 
-if(X11_FOUND)
-	add_executable(eglgears_x11 eglgears.c)
-	target_link_libraries(eglgears_x11 eglut_x11)
-endif(X11_FOUND)
+	add_executable (xeglthreads xeglthreads.c)
+	target_link_libraries (xeglthreads ${X11_X11_LIB})
+endif (X11_FOUND)
 




More information about the mesa-commit mailing list