From 1cdf84cda1cfc6f249a53b3cc2ca6f67f748245e Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 13 Aug 2016 03:08:11 +0000 Subject: [PATCH] better handling of the X11 extensions Signed-off-by: Ivailo Monev --- CMakeLists.txt | 10 +++++++++- src/gui/CMakeLists.txt | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0521ec563..b3c0e0f35 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -563,7 +563,7 @@ endif() # keep in sync with the gui component CMake file, only definitions setup is needed here if(WITH_X11 AND X11_FOUND) # TODO: xim - foreach(x11ext Xshape Xinerama Xrandr Xrender XSync Xkb Xfixes Xcursor Xinput XShm) + foreach(x11ext Xinerama Xrandr Xrender Xfixes Xcursor Xinput) # X11_${x11ext}_FOUND is set depending on the headers only if(NOT X11_${x11ext}_FOUND OR NOT X11_${x11ext}_LIB) message(WARNING "The X11 ${x11ext} extension was not found") @@ -571,6 +571,14 @@ if(WITH_X11 AND X11_FOUND) katie_definition(-DQT_NO_${upperext}) endif() endforeach() + if(NOT X11_Xkbfile_FOUND) + message(WARNING "The X11 Xkbfile extension was not found") + katie_definition(-DQT_NO_XKB) + endif() + if(NOT X11_Xext_FOUND) + message(WARNING "The X11 Xext extension was not found") + katie_definition(-DQT_NO_XSYNC -DQT_NO_XSHAPE -DQTT_NO_XSHM) + endif() if(NOT X11_Xinput_FOUND) message(WARNING "X11 Xinput extension was not found thus disabling tabled support too") katie_definition(-DQT_NO_TABLET) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index fbeb4a8d3..e877a466a 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -468,7 +468,7 @@ if(WITH_X11 AND X11_FOUND) ) include_directories(${X11_INCLUDE_DIR}) # TODO: xim - foreach(x11ext Xshape Xinerama Xrandr Xrender XSync Xkb Xfixes Xcursor Xinput XShm) + foreach(x11ext Xshape Xinerama Xrandr Xrender Xfixes Xcursor Xinput Xkbfile Xext) if(X11_${x11ext}_FOUND AND X11_${x11ext}_LIB) set(EXTRA_GUI_LIBS ${EXTRA_GUI_LIBS} -- 2.11.0