[kdebase/kwin] improved kompmgr building

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1226469 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 37 insertions, 6 deletions

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index c85d32a32..f35de0c3a 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -44,11 +44,13 @@ if( BUILD_KSMSERVER OR (WITH_HAL AND BUILD_KIOSLAVES))
 endif( )
 
 
-# xrender (kdesktop, konsole, kcontrol, kicker)
-if( BUILD_KDESKTOP OR BUILD_KONSOLE OR BUILD_KCONTROL OR BUILD_KICKER )
+# xrender (kdesktop, konsole, kcontrol, kicker, kwin)
+if( WITH_XRENDER OR BUILD_KDESKTOP OR BUILD_KONSOLE OR BUILD_KCONTROL OR BUILD_KICKER )
   pkg_search_module( XRENDER xrender )
   if( XRENDER_FOUND )
     set( HAVE_XRENDER 1 )
+  elseif( WITH_XRENDER )
+    tde_message_fatal( "xrender is requested, but was not found on your system" )
   endif( )
 endif( )
 
@@ -57,20 +59,49 @@ endif( )
 if( WITH_XCURSOR )
   pkg_search_module( XCURSOR xcursor )
   if( XCURSOR_FOUND )
-    set( HAVE_XCURSOR 1 CACHE INTERNAL "" FORCE )
+    set( HAVE_XCURSOR 1 )
   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( )
 
 
-# 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 )
   pkg_search_module( XFIXES xfixes )
   if( XFIXES_FOUND )
     set( HAVE_XFIXES 1 CACHE INTERNAL "" FORCE )
   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( )