From f616269af894b663337ba3076088336d6b844878 Mon Sep 17 00:00:00 2001
From: samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 30 Mar 2011 11:14:00 +0000
Subject: [kdebase/kwin] improved kompmgr building

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1226469 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kwin/CMakeLists.txt         |  2 +-
 kwin/kompmgr/CMakeLists.txt | 38 +++++++++++---------------------------
 2 files changed, 12 insertions(+), 28 deletions(-)

(limited to 'kwin')

diff --git a/kwin/CMakeLists.txt b/kwin/CMakeLists.txt
index 9dbcd8293..4eb23b7d2 100644
--- a/kwin/CMakeLists.txt
+++ b/kwin/CMakeLists.txt
@@ -16,7 +16,7 @@ add_subdirectory( pics )
 add_subdirectory( clients )
 add_subdirectory( oldheaders )
 add_subdirectory( data )
-add_subdirectory( kompmgr )
+tde_conditional_add_subdirectory( WITH_XCOMPOSITE kompmgr )
 
 
 include_directories(
diff --git a/kwin/kompmgr/CMakeLists.txt b/kwin/kompmgr/CMakeLists.txt
index d45eb655f..0cc2e5616 100644
--- a/kwin/kompmgr/CMakeLists.txt
+++ b/kwin/kompmgr/CMakeLists.txt
@@ -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(
-  ${CMAKE_CURRENT_BINARY_DIR}
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
@@ -49,8 +33,8 @@ link_directories(
 
 ##### kompmgr (executable) #######################
 
-tde_add_executable( kompmgr AUTOMOC
+tde_add_executable( kompmgr
   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}
 )
-- 
cgit v1.2.3