summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohann Latocha2012-03-23 17:34:58 +0100
committerJohann Latocha2012-03-23 17:34:58 +0100
commit8499e79e995e7315ac576afc7e934c88cf77495d (patch)
treeade2af868768ec108ac5bf34138ace4dbf5d6875
parent[PVSMGRTOUCH] New icons in online help (diff)
downloadpvs-8499e79e995e7315ac576afc7e934c88cf77495d.tar.gz
pvs-8499e79e995e7315ac576afc7e934c88cf77495d.tar.xz
pvs-8499e79e995e7315ac576afc7e934c88cf77495d.zip
Ubuntu 11.10 fix (XIQueryDevice)HEADmaster
-rw-r--r--CMakeLists.txt4
-rw-r--r--src/input/CMakeLists.txt6
2 files changed, 7 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c79f918..c31d406 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -343,11 +343,9 @@ TARGET_LINK_LIBRARIES(pvsmgrtouch
)
TARGET_LINK_LIBRARIES(pvs
- ${QT_LIBRARIES}
${VNC_LIBRARIES}
${X11_LIBRARIES}
- ${X11_XTest_LIB}
- ${X11_Xinput_LIB}
+ ${QT_LIBRARIES}
pvsmcast
pvsinput
)
diff --git a/src/input/CMakeLists.txt b/src/input/CMakeLists.txt
index 26eeb64..ad035e1 100644
--- a/src/input/CMakeLists.txt
+++ b/src/input/CMakeLists.txt
@@ -165,6 +165,12 @@ add_library(
${pvsinput_RCS}
)
+TARGET_LINK_LIBRARIES(pvsinput
+ ${X11_Xinput_LIB}
+ ${X11_XTest_LIB}
+)
+
+
if(EXISTS /etc/gentoo-release)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pvsprivinputd.gentooinit.in ${CMAKE_CURRENT_BINARY_DIR}/pvsprivinputd.init @ONLY@)
else()