Demos (master): cmake: Link against Xext.

[Jose Fonseca]

Module: Demos
Branch: master
Commit: 14c4892cc5793cb663bf1987a577dd406509ba6a
URL:    
http://cgit.freedesktop.org/mesa/demos/commit/?id=14c4892cc5793cb663bf1987a577dd406509ba6a

Author: José Fonseca <jfons...@vmware.com>
Date:   Tue May 10 15:17:32 2011 +0100

cmake: Link against Xext.

---

 CMakeLists.txt             |    2 +-
 src/samples/CMakeLists.txt |    3 ++-
 src/tests/CMakeLists.txt   |    3 ++-
 src/xdemos/CMakeLists.txt  |    3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dea47aa..ccc5680 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8)
 
 project (mesademos)
 
diff --git a/src/samples/CMakeLists.txt b/src/samples/CMakeLists.txt
index 3d5d9fc..3ac7771 100644
--- a/src/samples/CMakeLists.txt
+++ b/src/samples/CMakeLists.txt
@@ -63,7 +63,8 @@ if (X11_FOUND)
        )
 
        link_libraries (
-               ${X11_X11_LIBRARY}
+               ${X11_Xext_LIB}
+               ${X11_X11_LIB}
        )
 
        set (xtargets
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 5377483..8335ff2 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -150,7 +150,8 @@ if (X11_FOUND)
        )
 
        link_libraries (
-               ${X11_X11_LIBRARY}
+               ${X11_Xext_LIB}
+               ${X11_X11_LIB}
        )
 
        set (xtargets
diff --git a/src/xdemos/CMakeLists.txt b/src/xdemos/CMakeLists.txt
index b335fcf..5c457d6 100644
--- a/src/xdemos/CMakeLists.txt
+++ b/src/xdemos/CMakeLists.txt
@@ -13,8 +13,9 @@ link_libraries (
        util
        ${OPENGL_gl_LIBRARY}
        ${OPENGL_glu_LIBRARY}
-       ${X11_X11_LIBRARY}
        ${GLEW_glew_LIBRARY}
+       ${X11_X11_LIB}
+       ${X11_Xext_LIB}
 )
 
 add_library (pbutil pbutil.c)

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit