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

setup X11 related definitions from the top-level CMake file

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-07-10 03:03:15 +03:00
parent 9ebc979ae2
commit 498512c819
2 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
CMakeLists.txt
View file

@ -566,6 +566,26 @@ if(NOT WITH_TIFF OR NOT TIFF_FOUND)
katie_definition(-DQT_NO_IMAGEFORMAT_TIFF)
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)
if(NOT X11_${x11ext}_FOUND)
message(WARNING "The X11 ${x11ext} extension was not found")
string(TOUPPER "${x11ext}" upperext)
katie_definition(-DQT_NO_${upperext})
endif()
endforeach()
if(NOT X11_Xinput_FOUND)
message(WARNING "X11 Xinput extension was not found thus disabling tabled support too")
katie_definition(-DQT_NO_TABLET)
endif()
if(NOT X11_SM_FOUND)
message(WARNING "X11 SM was not found thus disabling session manager support")
katie_definition(-DQT_NO_SESSIONMANAGER)
endif()
endif()
# semi-shared
include(src/shared/linguist/linguist.cmake)
include(src/shared/bootstrap.cmake)

15
src/gui/CMakeLists.txt
View file

@ -450,6 +450,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/core/tools
)
# keep in sync with the top-level CMake file, only libraries setup is needed here
if(WITH_X11 AND X11_FOUND)
set(EXTRA_GUI_LIBS
${EXTRA_GUI_LIBS}
@ -459,8 +460,6 @@ if(WITH_X11 AND X11_FOUND)
${X11_Xi_LIB}
)
include_directories(${X11_INCLUDE_DIR})
# in case those may be usefull via KATIE_DEFINITIONS the checks will have to
# be moved to the top-level CMake file
# TODO: xim
foreach(x11ext Xshape Xinerama Xrandr Xrender XSync Xkb Xfixes Xcursor Xinput XShm)
if(X11_${x11ext}_FOUND)
@ -468,20 +467,8 @@ if(WITH_X11 AND X11_FOUND)
${EXTRA_GUI_LIBS}
${X11_${x11ext}_LIB}
)
else()
message(WARNING "The X11 ${x11ext} extension was not found")
string(TOUPPER "${x11ext}" upperext)
add_definitions(-DQT_NO_${upperext})
endif()
endforeach()
if(NOT X11_Xinput_FOUND)
message(WARNING "X11 Xinput extension was not found thus disabling tabled support too")
add_definitions(-DQT_NO_TABLET)
endif()
if(NOT X11_SM_FOUND)
message(WARNING "X11 SM was not found thus disabling session manager support")
add_definitions(-DQT_NO_SESSIONMANAGER)
endif()
endif()
if(WITH_NIS AND NIS_FOUND)