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

generic: make good use of the X11 CMake module

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2016-08-13 14:26:06 +00:00
parent b122886e62
commit 77538485b1
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ConfigureChecks.cmake
View file

@ -7,8 +7,6 @@ set_package_properties(PAM PROPERTIES DESCRIPTION "PAM Libraries"
include(CheckTypeSize) include(CheckTypeSize)
include(FindPkgConfig) include(FindPkgConfig)
macro_optional_find_package(XKB) # kxkb, kdm
if (PAM_FOUND) if (PAM_FOUND)
set(KDE4_COMMON_PAM_SERVICE "kde" CACHE STRING "The PAM service to use unless overridden for a particular app.") set(KDE4_COMMON_PAM_SERVICE "kde" CACHE STRING "The PAM service to use unless overridden for a particular app.")
@ -78,6 +76,7 @@ macro_bool_to_01(X11_Xcomposite_FOUND HAVE_XCOMPOSITE) # kicker, kwin
macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses
macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin
macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin
macro_bool_to_01(X11_Xkb_FOUND HAVE_XKB) # kdm, kglobalaccel, kcontrol/keyboard
if(WITH_XINERAMA) if(WITH_XINERAMA)
macro_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA) macro_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA)
else(WITH_XINERAMA) else(WITH_XINERAMA)

4
kglobalaccel/CMakeLists.txt
View file

@ -5,10 +5,6 @@ project(kglobalaccel)
include_directories(${KDE4_KDEUI_INCLUDES}) include_directories(${KDE4_KDEUI_INCLUDES})
if(X11_Xkb_FOUND)
SET(HAVE_XKB TRUE)
endif()
configure_file( configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/config-kglobalaccel.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config-kglobalaccel.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/config-kglobalaccel.h ${CMAKE_CURRENT_BINARY_DIR}/config-kglobalaccel.h