Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 02:42:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

session management requires X11 ICE extension in addition to SM

Browse source 
while at it, remove X11_LIBRARIES from the list of additional libraries
of KtGui component to avoid overlinking

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-02-11 00:47:39 +00:00
parent ab15bbf194
commit 93efd5ac51
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -555,8 +555,8 @@ if(NOT X11_Xext_FOUND)
message(WARNING "The X11 Xext extension was not found")
katie_definition(-DQT_NO_XSYNC -DQT_NO_XSHAPE -DQT_NO_XSHM)
endif()
if(NOT X11_SM_FOUND)
message(WARNING "X11 SM was not found thus disabling session manager support")
if(NOT X11_SM_FOUND OR NOT X11_ICE_FOUND)
message(WARNING "X11 SM/ICE was not found thus disabling session manager support")
katie_definition(-DQT_NO_SESSIONMANAGER)
endif()

3
src/gui/CMakeLists.txt
View file

@ -2,7 +2,6 @@
set(EXTRA_GUI_LIBS
KtCore KtXml
${FREETYPE_LIBRARIES}
${X11_LIBRARIES}
${X11_X11_LIB}
)
@ -935,7 +934,7 @@ set(GUI_SOURCES
)
# keep in sync with the top-level CMake file, only libraries setup is needed here
foreach(x11ext Xshape Xinerama Xrandr Xrender Xfixes Xcursor Xext)
foreach(x11ext Xshape Xinerama Xrandr Xrender Xfixes Xcursor Xext SM ICE)
if(X11_${x11ext}_FOUND AND X11_${x11ext}_LIB)
set(EXTRA_GUI_LIBS
${EXTRA_GUI_LIBS}