Commit 428fa1b8 authored by Ian Romanick's avatar Ian Romanick
Browse files

Use correct libX11



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: default avatarIan Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jose Fonseca's avatarJosé Fonseca <jfonseca@vmware.com>
parent 0bfd02de
...@@ -16,13 +16,13 @@ link_libraries ( ...@@ -16,13 +16,13 @@ link_libraries (
IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
add_executable (egl-nok-swap-region egl-util.c egl-nok-swap-region.c) 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) 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) 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) 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") ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
# vim: ft=cmake: # vim: ft=cmake:
...@@ -20,10 +20,6 @@ link_libraries ( ...@@ -20,10 +20,6 @@ link_libraries (
${GLUT_glut_LIBRARY} ${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-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-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) add_executable(hiz-depth-stencil-test-fbo-d24-s8 hiz-depth-stencil-test-fbo-d24-s8.c)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment