summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2011-05-10 15:17:32 +0100
committerJosé Fonseca <jfonseca@vmware.com>2011-05-10 15:17:32 +0100
commit14c4892cc5793cb663bf1987a577dd406509ba6a (patch)
tree50a2c335fcb6aa44bcc2e3a73c712b274de209ef
parentde75383f8f3a889b01ae0d54a4eefdd3ac57c81e (diff)
cmake: Link against Xext.
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/samples/CMakeLists.txt3
-rw-r--r--src/tests/CMakeLists.txt3
-rw-r--r--src/xdemos/CMakeLists.txt3
4 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dea47aa4..ccc56806 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 3d5d9fc3..3ac7771e 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 53774837..8335ff29 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 b335fcf6..5c457d6f 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)