[kdebase/kwin] improved kompmgr building

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1226469 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
samelian 14 years ago
parent 6c9be4e7d0
commit f616269af8

@ -51,6 +51,9 @@ option( WITH_XCOMPOSITE "Enable xcomposite support" OFF )
option( WITH_XCURSOR "Enable xcursor support" OFF ) option( WITH_XCURSOR "Enable xcursor support" OFF )
option( WITH_XFIXES "Enable xfixes support" OFF ) option( WITH_XFIXES "Enable xfixes support" OFF )
option( WITH_XRANDR "Enable xrandr support" OFF ) option( WITH_XRANDR "Enable xrandr support" OFF )
option( WITH_XRENDER "Enable xrender support" OFF )
option( WITH_XDAMAGE "Enable xdamage support" OFF )
option( WITH_XEXT "Enable xext support" OFF )
option( WITH_LIBUSB "Enable control of some mouse models through libusb" OFF ) option( WITH_LIBUSB "Enable control of some mouse models through libusb" OFF )
option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw1394" OFF ) option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw1394" OFF )
option( WITH_SUDO_KDESU_BACKEND "Use sudo as backend for kdesu (default is su)" OFF ) option( WITH_SUDO_KDESU_BACKEND "Use sudo as backend for kdesu (default is su)" OFF )

@ -44,11 +44,13 @@ if( BUILD_KSMSERVER OR (WITH_HAL AND BUILD_KIOSLAVES))
endif( ) endif( )
# xrender (kdesktop, konsole, kcontrol, kicker) # xrender (kdesktop, konsole, kcontrol, kicker, kwin)
if( BUILD_KDESKTOP OR BUILD_KONSOLE OR BUILD_KCONTROL OR BUILD_KICKER ) if( WITH_XRENDER OR BUILD_KDESKTOP OR BUILD_KONSOLE OR BUILD_KCONTROL OR BUILD_KICKER )
pkg_search_module( XRENDER xrender ) pkg_search_module( XRENDER xrender )
if( XRENDER_FOUND ) if( XRENDER_FOUND )
set( HAVE_XRENDER 1 ) set( HAVE_XRENDER 1 )
elseif( WITH_XRENDER )
tde_message_fatal( "xrender is requested, but was not found on your system" )
endif( ) endif( )
endif( ) endif( )
@ -57,20 +59,49 @@ endif( )
if( WITH_XCURSOR ) if( WITH_XCURSOR )
pkg_search_module( XCURSOR xcursor ) pkg_search_module( XCURSOR xcursor )
if( XCURSOR_FOUND ) if( XCURSOR_FOUND )
set( HAVE_XCURSOR 1 CACHE INTERNAL "" FORCE ) set( HAVE_XCURSOR 1 )
else( ) else( )
tde_message_fatal( "xcursor are requested, but not found on your system" ) tde_message_fatal( "xcursor is requested, but was not found on your system" )
endif( ) endif( )
endif( ) endif( )
# xfixes (klipper) # xcomposite (kicker, kwin)
if( WITH_XCOMPOSITE )
pkg_search_module( XCOMPOSITE xcomposite )
if( XCOMPOSITE_FOUND )
set( HAVE_XCOMPOSITE 1 )
else( XCOMPOSITE_FOUND )
tde_message_fatal( "xcomposite is requested, but was not found on your system" )
endif( XCOMPOSITE_FOUND )
endif( )
# xfixes (klipper, kicker)
if( WITH_XFIXES ) if( WITH_XFIXES )
pkg_search_module( XFIXES xfixes ) pkg_search_module( XFIXES xfixes )
if( XFIXES_FOUND ) if( XFIXES_FOUND )
set( HAVE_XFIXES 1 CACHE INTERNAL "" FORCE ) set( HAVE_XFIXES 1 CACHE INTERNAL "" FORCE )
else( ) else( )
tde_message_fatal( "xfixes are requested, but not found on your system" ) tde_message_fatal( "xfixes is requested, but was not found on your system" )
endif( )
endif( )
# xdamage (kwin/kompmgr)
if( WITH_XDAMAGE )
pkg_search_module( XDAMAGE xdamage )
if( NOT XDAMAGE_FOUND )
tde_message_fatal( "xdamage is requested, but was not found on your system" )
endif( )
endif( )
# xext (kwin/kompmgr)
if( WITH_XEXT )
pkg_search_module( XEXT xext )
if( NOT XEXT_FOUND )
tde_message_fatal( "xext is requested, but was not found on your system" )
endif( ) endif( )
endif( ) endif( )

@ -16,7 +16,7 @@ add_subdirectory( pics )
add_subdirectory( clients ) add_subdirectory( clients )
add_subdirectory( oldheaders ) add_subdirectory( oldheaders )
add_subdirectory( data ) add_subdirectory( data )
add_subdirectory( kompmgr ) tde_conditional_add_subdirectory( WITH_XCOMPOSITE kompmgr )
include_directories( include_directories(

@ -9,35 +9,19 @@
# #
################################################# #################################################
##### check for xcomposite ######################
if( WITH_XCOMPOSITE ) if( NOT WITH_XRENDER )
tde_message_fatal( "xrender support is needed to build kompmgr.\n Pass -DWITH_XRENDER=ON to cmake arguments." )
elseif( NOT WITH_XFIXES )
tde_message_fatal( "xfixes support is needed to build kompmgr.\n Pass -DWITH_XFIXES=ON to cmake arguments." )
elseif( NOT WITH_XDAMAGE )
tde_message_fatal( "xdamage support is needed to build kompmgr.\n Pass -DWITH_XDAMAGE=ON to cmake arguments." )
elseif( NOT WITH_XEXT )
tde_message_fatal( "xext support is needed to build kompmgr.\n Pass -DWITH_XEXT=ON to cmake arguments." )
endif( )
pkg_search_module( XCOMPOSITE xcomposite )
if( XCOMPOSITE_FOUND )
set( HAVE_XCOMPOSITE 1 CACHE INTERNAL "" )
else( XCOMPOSITE_FOUND )
message(FATAL_ERROR "\nxcomposite are requested, but not found on your system" )
endif( XCOMPOSITE_FOUND )
pkg_search_module( XFIXES xfixes )
if( XFIXES_FOUND )
set( HAVE_XFIXES 1 CACHE INTERNAL "" )
else( XFIXES_FOUND )
message(FATAL_ERROR "\nxfixes are required, but not found on your system" )
endif( XFIXES_FOUND )
pkg_search_module( XDAMAGE xdamage )
if( XDAMAGE_FOUND )
set( HAVE_XDAMAGE 1 CACHE INTERNAL "" )
else( XDAMAGE_FOUND )
message(FATAL_ERROR "\nxdamage are required, but not found on your system" )
endif( XDAMAGE_FOUND )
endif( WITH_XCOMPOSITE )
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
) )
@ -49,8 +33,8 @@ link_directories(
##### kompmgr (executable) ####################### ##### kompmgr (executable) #######################
tde_add_executable( kompmgr AUTOMOC tde_add_executable( kompmgr
SOURCES kompmgr.c SOURCES kompmgr.c
LINK m X11 ${XFIXES_LIBRARIES} ${XRENDER_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ${XDAMAGE_LIBRARIES} LINK m ${XRENDER_LIBRARIES} ${XFIXES_LIBRARIES} ${XDAMAGE_LIBRARIES} ${XEXT_LIBRARIES} ${XCOMPOSITE_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

Loading…
Cancel
Save