[Piglit] [PATCH 3/4] tests/glx: fix Xrender detection

nobled nobled at dreamwidth.org
Tue Feb 28 14:06:23 PST 2012


Use the variables CMake provides so that compilation won't
break if Xrender is in a different include directory.

Also give a sensible error message if it's not found.
---
 tests/glx/CMakeLists.gl.txt |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/tests/glx/CMakeLists.gl.txt b/tests/glx/CMakeLists.gl.txt
index c20bec7..3307fc7 100644
--- a/tests/glx/CMakeLists.gl.txt
+++ b/tests/glx/CMakeLists.gl.txt
@@ -15,6 +15,12 @@ link_libraries (
 )

 IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+	if (NOT X11_Xrender_FOUND)
+		message(FATAL_ERROR "Xrender development headers required!")
+	endif()
+	include_directories(
+		${X11_Xrender_INCLUDE_PATH}
+	)
 	add_executable (glx-fbconfig-sanity glx-fbconfig-sanity.c)
 	add_executable (glx-fbconfig-compliance glx-fbconfig-compliance.c)
 	add_executable (glx-fbo-binding glx-fbo-binding.c)
@@ -41,7 +47,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	add_executable (glx-swap-pixmap-bad glx-swap-pixmap-bad.c)
 	add_executable (glx-swap-singlebuffer glx-swap-singlebuffer.c)
 	add_executable (glx-tfp glx-tfp.c)
-	target_link_libraries(glx-tfp Xrender)
+	target_link_libraries(glx-tfp ${X11_Xrender_LIB})

 	add_executable (glx-pixmap-life glx-pixmap-life.c)
 	add_executable (glx-pixmap13-life glx-pixmap13-life.c)
-- 
1.7.4.1


More information about the Piglit mailing list