[Piglit] [PATCH 2/2] Use correct libX11

[Ian Romanick]

From: Ian Romanick <ian.d.romanick at intel.com>

The previous mechanism caused

    -lX11 /path/to/my/new/lib/libX11.so

to be on the link command line.  Since there's no -L option, the wrong
libX11 got linked.  With newer versions of libX11, this caused link
failures.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
 tests/egl/CMakeLists.gl.txt |    8 ++++----
 tests/hiz/CMakeLists.gl.txt |    4 ----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/tests/egl/CMakeLists.gl.txt b/tests/egl/CMakeLists.gl.txt
index 1ab0dd5..1cea990 100644
--- a/tests/egl/CMakeLists.gl.txt
+++ b/tests/egl/CMakeLists.gl.txt
@@ -16,13 +16,13 @@ link_libraries (
 
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	add_executable (egl-nok-swap-region egl-util.c egl-nok-swap-region.c)
-	target_link_libraries(egl-nok-swap-region pthread X11)
+	target_link_libraries(egl-nok-swap-region pthread ${X11_X11_LIB})
 	add_executable (egl-nok-texture-from-pixmap egl-util.c egl-nok-texture-from-pixmap.c)
-	target_link_libraries(egl-nok-texture-from-pixmap pthread X11)
+	target_link_libraries(egl-nok-texture-from-pixmap pthread ${X11_X11_LIB})
 	add_executable (egl-create-surface egl-util.c egl-create-surface.c)
-	target_link_libraries(egl-create-surface pthread X11)
+	target_link_libraries(egl-create-surface pthread ${X11_X11_LIB})
 	add_executable (egl-query-surface egl-util.c egl-query-surface.c)
-	target_link_libraries(egl-query-surface pthread X11)
+	target_link_libraries(egl-query-surface pthread ${X11_X11_LIB})
 ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 # vim: ft=cmake:
diff --git a/tests/hiz/CMakeLists.gl.txt b/tests/hiz/CMakeLists.gl.txt
index f6559fa..832c475 100644
--- a/tests/hiz/CMakeLists.gl.txt
+++ b/tests/hiz/CMakeLists.gl.txt
@@ -20,10 +20,6 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-	link_libraries(pthread X11)
-ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-
 add_executable(hiz-depth-stencil-test-fbo-d0-s8 hiz-depth-stencil-test-fbo-d0-s8.c)
 add_executable(hiz-depth-stencil-test-fbo-d24-s0 hiz-depth-stencil-test-fbo-d24-s0.c)
 add_executable(hiz-depth-stencil-test-fbo-d24-s8 hiz-depth-stencil-test-fbo-d24-s8.c)
-- 
1.7.6.4