cmake: Build API-independent piglitutil library

Build API-independent utilities to piglitutil library and link all other
utility libraries to it (gl, gles1, gles2).

Signed-off-by: Blaž Tomažič <blaz.tomazic@gmail.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>

5 files changed, 75 insertions, 42 deletions

diff --git a/tests/util/CMakeLists.gl.txt b/tests/util/CMakeLists.gl.txt
index 4d07d370..8b8d40e4 100644
--- a/tests/util/CMakeLists.gl.txt
+++ b/tests/util/CMakeLists.gl.txt
@@ -1,10 +1,5 @@
-include_directories(
-	${GLEXT_INCLUDE_DIR}
-	${OPENGL_INCLUDE_PATH}
-	)
-
-set(UTIL_SOURCES
-	${UTIL_SOURCES}
+set(UTIL_GL_SOURCES
+	${UTIL_GL_SOURCES}
 	piglit-dispatch.c
 	piglit-dispatch-init.c
 	piglit-shader.c
@@ -16,6 +11,14 @@ set(UTIL_SOURCES
 	minmax-test.c
 	)
 
+include_directories(
+	${UTIL_GL_INCLUDES}
+	)
+
+link_libraries(
+	${UTIL_GL_LIBS}
+	)
+
 IF(BUILD_GLX_TESTS)
 	# XXX: This is currently duplicated wherever tests
 	# include "piglit-glx-util.h". Is it possible to refactor it?
@@ -28,7 +31,6 @@ IF(BUILD_GLX_TESTS)
 		    piglit-shader.c
 		    piglit-shader-gl.c
 		    piglit-transform-feedback.c
-		    piglit-util.c
 		    piglit-util-gl-common.c
 		    piglit-util-gl-enum.c
 		    piglit-util-gl.c
@@ -37,18 +39,14 @@ IF(BUILD_GLX_TESTS)
 		    piglit-dispatch.c
 		    piglit-dispatch-init.c
 	)
-	set (UTIL_SOURCES
-		${UTIL_SOURCES}
+	set (UTIL_GL_SOURCES
+		${UTIL_GL_SOURCES}
 		piglit-glx-util.c
 	)
 ENDIF(BUILD_GLX_TESTS)
 
 piglit_add_library (piglitutil_${piglit_target_api}
-	${UTIL_SOURCES}
+	${UTIL_GL_SOURCES}
 )
 
-if(UNIX)
-	target_link_libraries(piglitutil_${piglit_target_api} m)
-endif(UNIX)
-
 # vim: ft=cmake:
diff --git a/tests/util/CMakeLists.gles1.txt b/tests/util/CMakeLists.gles1.txt
index 95c42e50..09dff856 100644
--- a/tests/util/CMakeLists.gles1.txt
+++ b/tests/util/CMakeLists.gles1.txt
@@ -1,19 +1,20 @@
-set(UTIL_SOURCES
-	${UTIL_SOURCES}
+set(UTIL_GL_SOURCES
+	${UTIL_GL_SOURCES}
 	piglit-util-gles.c
 	)
 
+include_directories(
+	${UTIL_GL_INCLUDES}
+	)
+
 link_libraries(
+	${UTIL_GL_LIBS}
 	${OPENGL_gles1_LIBRARY}
 	piglitutil_${piglit_target_api}
 	)
 
 piglit_add_library(piglitutil_${piglit_target_api}
-	${UTIL_SOURCES}
+	${UTIL_GL_SOURCES}
 )
 
-if(UNIX)
-	target_link_libraries(piglitutil_${piglit_target_api} m)
-endif(UNIX)
-
 # vim: ft=cmake:
diff --git a/tests/util/CMakeLists.gles2.txt b/tests/util/CMakeLists.gles2.txt
index 244de612..e482ba7d 100644
--- a/tests/util/CMakeLists.gles2.txt
+++ b/tests/util/CMakeLists.gles2.txt
@@ -1,21 +1,22 @@
-set(UTIL_SOURCES
-	${UTIL_SOURCES}
+set(UTIL_GL_SOURCES
+	${UTIL_GL_SOURCES}
 	piglit-shader.c
 	piglit-shader-gles2.c
 	piglit-util-gles.c
 	)
 
+include_directories(
+	${UTIL_GL_INCLUDES}
+	)
+
 link_libraries(
+	${UTIL_GL_LIBS}
 	${OPENGL_gles2_LIBRARY}
 	piglitutil_${piglit_target_api}
 	)
 
 piglit_add_library(piglitutil_${piglit_target_api}
-	${UTIL_SOURCES}
+	${UTIL_GL_SOURCES}
 )
 
-if(UNIX)
-	target_link_libraries(piglitutil_${piglit_target_api} m)
-endif(UNIX)
-
 # vim: ft=cmake:
diff --git a/tests/util/CMakeLists.no_api.txt b/tests/util/CMakeLists.no_api.txt
new file mode 100644
index 00000000..c3313684
--- /dev/null
+++ b/tests/util/CMakeLists.no_api.txt
@@ -0,0 +1,13 @@
+include_directories(
+	${UTIL_INCLUDES}
+)
+
+piglit_add_library (piglitutil
+	${UTIL_SOURCES}
+)
+
+if(UNIX)
+	target_link_libraries(piglitutil m)
+endif(UNIX)
+
+# vim: ft=cmake:
diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
index 152b2d11..f0795b01 100644
--- a/tests/util/CMakeLists.txt
+++ b/tests/util/CMakeLists.txt
@@ -1,19 +1,22 @@
 add_definitions(-DSOURCE_DIR="${piglit_SOURCE_DIR}/")
 
-include_directories(
-	${GLEXT_INCLUDE_DIR}
-	${OPENGL_INCLUDE_PATH}
+set(UTIL_INCLUDES
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-	link_libraries(${X11_X11_LIB})
-endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+	)
 
 set(UTIL_SOURCES
-	fdo-bitmap.c
 	piglit-util.c
+	)
+
+set(UTIL_GL_INCLUDES
+	${UTIL_INCLUDES}
+	${GLEXT_INCLUDE_DIR}
+	${OPENGL_INCLUDE_PATH}
+	)
+
+set(UTIL_GL_SOURCES
+	fdo-bitmap.c
 	piglit-util-gl-common.c
 	piglit-util-gl-enum.c
 	piglit-framework.c
@@ -22,16 +25,33 @@ set(UTIL_SOURCES
 	rgb9e5.c
 	)
 
+set(UTIL_GL_LIBS
+	piglitutil
+	)
+
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+	set(UTIL_GL_LIBS
+		${UTIL_GL_LIBS}
+		${X11_X11_LIB}
+	)
+endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+
 if(OPENGL_egl_LIBRARY)
-	set(UTIL_SOURCES
-	    ${UTIL_SOURCES}
+	set(UTIL_GL_SOURCES
+	    ${UTIL_GL_SOURCES}
 	    piglit-util-egl.c
 	    )
-	link_libraries(${OPENGL_egl_LIBRARY})
+	set(UTIL_GL_LIBS
+		${UTIL_GL_LIBS}
+		${OPENGL_egl_LIBRARY}
+	)
 endif(OPENGL_egl_LIBRARY)
 
 if(USE_WAFFLE)
-	link_libraries("${WAFFLE_waffle_LIBRARY}")
+	set(UTIL_GL_LIBS
+		${UTIL_GL_LIBS}
+		"${WAFFLE_waffle_LIBRARY}"
+	)
 endif(USE_WAFFLE)
 
 piglit_include_target_api()