Remove useless cmake configuration options WITH_XEXT and WITH_XDAMAGE

pull/2/head
Alexander Golubev 9 years ago committed by Slávek Banko
parent 9fb2cb290e
commit 3c75381e05
  1. 8
      CMakeLists.txt
  2. 34
      ConfigureChecks.cmake
  3. 4
      twin/compton-tde/CMakeLists.txt
  4. 4
      twin/kompmgr/CMakeLists.txt

@ -71,8 +71,6 @@ option( WITH_XCURSOR "Enable xcursor support" ${WITH_ALL_OPTIONS} )
option( WITH_XFIXES "Enable xfixes support" ${WITH_ALL_OPTIONS} )
option( WITH_XRANDR "Enable xrandr support" ${WITH_ALL_OPTIONS} )
option( WITH_XRENDER "Enable xrender support" ${WITH_ALL_OPTIONS} )
option( WITH_XDAMAGE "Enable xdamage support" ${WITH_ALL_OPTIONS} )
option( WITH_XEXT "Enable xext support" ${WITH_ALL_OPTIONS} )
option( WITH_LIBCONFIG "Enable libconfig support" ${WITH_ALL_OPTIONS} )
option( WITH_XTEST "Enable xtest support" ${WITH_ALL_OPTIONS} )
option( WITH_OPENGL "Enable openGL support" ${WITH_ALL_OPTIONS} )
@ -104,8 +102,6 @@ option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden"
# WITH_XCOMPOSITE affects twin kicker(taskmanager) tdm
# WITH_XCURSOR affects tdeioslaves(thumbnail), kcontrol(input), kdesktop
# WITH_XFIXES affects twin klipper kicker(taskmanager)
# WITH_XDAMAGE affects <nothing>
# WITH_XEXT affects <nothing>
# WITH_XRANDR affects tdm, kcontrol(displayconfig randr iccconfig)
# WITH_XRENDER affects twin konsole kicker(taskmanager) kdesktop
# kcontrol(style)
@ -136,10 +132,6 @@ option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden"
# NOTE: if WITH_XCOMPOSITE=ON then the following options are also required:
# WITH_XRENDER=ON
# WITH_XFIXES=ON
# WITH_XDAMAGE=ON
# WITH_XEXT=ON
# NOTE: seems WITH_XDAMAGE and WITH_XET doesn't change anything
# they are just required by WITH_XCOMPOSITE
##### user requested modules ####################

@ -102,6 +102,20 @@ if( WITH_XCOMPOSITE )
else( XCOMPOSITE_FOUND )
tde_message_fatal( "xcomposite is requested, but was not found on your system" )
endif( XCOMPOSITE_FOUND )
# xdamage (twin/kompmgr)
pkg_search_module( XDAMAGE xdamage )
if( NOT XDAMAGE_FOUND )
tde_message_fatal( "xdamage is required for xcomposite support, but was not found on your system" )
endif( )
# xext (twin/kompmgr)
pkg_search_module( XEXT xext )
if( NOT XEXT_FOUND )
tde_message_fatal( "xext is required for xcomposite support, but was not found on your system" )
endif( )
endif( )
@ -116,26 +130,6 @@ if( WITH_XFIXES )
endif( )
# xdamage (twin/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 (twin/kompmgr)
if( WITH_XEXT )
pkg_search_module( XEXT xext )
if( XEXT_FOUND )
set( HAVE_XEXT 1 )
else( XEXT_FOUND )
tde_message_fatal( "xext is requested, but was not found on your system" )
endif( )
endif( )
# libconfig (twin/compton-tde)
if( WITH_LIBCONFIG )
pkg_search_module( LIBCONFIG libconfig )

@ -16,10 +16,6 @@ elseif( NOT WITH_XRANDR )
tde_message_fatal( "xrandr support is needed to build compton-tde.\n Pass -DWITH_XRANDR=ON to cmake arguments." )
elseif( NOT WITH_XFIXES )
tde_message_fatal( "xfixes support is needed to build compton-tde.\n Pass -DWITH_XFIXES=ON to cmake arguments." )
elseif( NOT WITH_XDAMAGE )
tde_message_fatal( "xdamage support is needed to build compton-tde.\n Pass -DWITH_XDAMAGE=ON to cmake arguments." )
elseif( NOT WITH_XEXT )
tde_message_fatal( "xext support is needed to build compton-tde.\n Pass -DWITH_XEXT=ON to cmake arguments." )
elseif( NOT WITH_XINERAMA )
tde_message_fatal( "xinerama support is needed to build compton-tde.\n Pass -DWITH_XINERAMA=ON to cmake arguments." )
elseif( NOT WITH_LIBCONFIG )

@ -14,10 +14,6 @@ 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( )

Loading…
Cancel
Save