Demos (master): cmake: Build glsl subdir too.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Wed Mar 9 15:15:15 UTC 2011


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

Author: José Fonseca <jfonseca at vmware.com>
Date:   Wed Mar  9 15:13:56 2011 +0000

cmake: Build glsl subdir too.

---

 src/CMakeLists.txt      |    1 +
 src/glsl/CMakeLists.txt |   62 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 0 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a7f3733..87f4588 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,6 +8,7 @@ add_subdirectory (samples)
 add_subdirectory (perf)
 add_subdirectory (objviewer)
 
+add_subdirectory (glsl)
 add_subdirectory (fp)
 add_subdirectory (fpglsl)
 add_subdirectory (vp)
diff --git a/src/glsl/CMakeLists.txt b/src/glsl/CMakeLists.txt
new file mode 100644
index 0000000..63234ab
--- /dev/null
+++ b/src/glsl/CMakeLists.txt
@@ -0,0 +1,62 @@
+include_directories (
+	${mesademos_SOURCE_DIR}/src/util
+	${OPENGL_INCLUDE_PATH}
+	${GLUT_INCLUDE_DIR}
+	${GLEW_INCLUDE_DIR}
+)
+
+link_directories (
+	${mesademos_SOURCE_DIR}/src/util
+)
+
+link_libraries (
+	util
+	${OPENGL_gl_LIBRARY}
+	${OPENGL_glu_LIBRARY}
+	${GLUT_glut_LIBRARY}
+	${GLEW_glew_LIBRARY}
+)
+
+set (subdir glsl)
+set (targets
+	array
+	bezier
+	bitmap
+	brick
+	bump
+	convolutions
+	deriv
+	fragcoord
+	fsraytrace
+	identity
+	linktest
+	mandelbrot
+	multinoise
+	multitex
+	noise2
+	noise
+	pointcoord
+	points
+	samplers
+	shadow_sampler
+	shtest
+	skinning
+	texaaline
+	texdemo1
+	toyball
+	trirast
+	twoside
+	vert-or-frag-only
+	vert-tex
+	vsraytrace
+)
+
+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)
+
+file (GLOB data *.frag *.vert *.shtest)
+
+install (FILES ${data} DESTINATION ${subdir})




More information about the mesa-commit mailing list