[Piglit] [PATCH 02/13] cmake: link OpenGL and OpenGL ES utility libs to piglitutil.

Kenney Phillis kphillisjr at gmail.com
Thu Oct 31 15:47:58 CET 2013


it's a good idea to make sure the dependency trees are properly set to
where all utilities are based on what is found in the noapi (piglitutil)
debugger.
---
 tests/util/CMakeLists.gl.txt    |    4 ++++
 tests/util/CMakeLists.gles1.txt |    1 +
 tests/util/CMakeLists.gles2.txt |    1 +
 tests/util/CMakeLists.gles3.txt |    1 +
 4 files changed, 7 insertions(+)

diff --git a/tests/util/CMakeLists.gl.txt b/tests/util/CMakeLists.gl.txt
index d8fb32c..715d630 100644
--- a/tests/util/CMakeLists.gl.txt
+++ b/tests/util/CMakeLists.gl.txt
@@ -53,4 +53,8 @@ piglit_add_library (piglitutil_${piglit_target_api}
 	${UTIL_GL_SOURCES}
 )
 
+target_link_libraries(piglitutil_${piglit_target_api}
+	piglitutil
+)
+
 # vim: ft=cmake:
diff --git a/tests/util/CMakeLists.gles1.txt b/tests/util/CMakeLists.gles1.txt
index 58cc67a..a9fffad 100644
--- a/tests/util/CMakeLists.gles1.txt
+++ b/tests/util/CMakeLists.gles1.txt
@@ -11,6 +11,7 @@ include_directories(
 link_libraries(
 	${UTIL_GL_LIBS}
 	${OPENGL_gles1_LIBRARY}
+	piglitutil
 	piglitutil_${piglit_target_api}
 	)
 
diff --git a/tests/util/CMakeLists.gles2.txt b/tests/util/CMakeLists.gles2.txt
index d2501e3..63d079e 100644
--- a/tests/util/CMakeLists.gles2.txt
+++ b/tests/util/CMakeLists.gles2.txt
@@ -17,6 +17,7 @@ include_directories(
 link_libraries(
 	${UTIL_GL_LIBS}
 	${OPENGL_gles2_LIBRARY}
+	piglitutil
 	piglitutil_${piglit_target_api}
 	)
 
diff --git a/tests/util/CMakeLists.gles3.txt b/tests/util/CMakeLists.gles3.txt
index 1cb591f..d83bdc3 100644
--- a/tests/util/CMakeLists.gles3.txt
+++ b/tests/util/CMakeLists.gles3.txt
@@ -16,6 +16,7 @@ include_directories(
 link_libraries(
 	${UTIL_GL_LIBS}
 	${OPENGL_gles2_LIBRARY}
+	piglitutil
 	piglitutil_${piglit_target_api}
 	)
 
-- 
1.7.9.5



More information about the Piglit mailing list