From aae8990d33bbfee205c75dc7e48e1c64f2beeff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
Date: Wed, 8 Oct 2014 21:25:38 +0200
Subject: [PATCH] Add a cmake detection for Xext library Remove hardcoded Xext
 flags in tderandr and tdestyles/keramik Add missing link flag in tdeui

---
 CMakeLists.txt                   | 6 ++++++
 tderandr/CMakeLists.txt          | 2 +-
 tdestyles/keramik/CMakeLists.txt | 2 +-
 tdeui/CMakeLists.txt             | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45f161b0e..11d3c4bfe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -679,6 +679,12 @@ if( WITH_XCOMPOSITE )
   else( WITH_XCOMPOSITE )
     tde_message_fatal( "xcomposite support was requested, but xcomposite was not found on your system" )
   endif( XCOMPOSITE_FOUND )
+
+  # xext (tderandr, tdestyles/keramik, tdeui)
+  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( WITH_XCOMPOSITE )
 
 
diff --git a/tderandr/CMakeLists.txt b/tderandr/CMakeLists.txt
index efcd8519d..e52da4c17 100644
--- a/tderandr/CMakeLists.txt
+++ b/tderandr/CMakeLists.txt
@@ -43,6 +43,6 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 0.0.95
-  LINK tdeui-shared ${XRANDR_LIBRARIES} Xext
+  LINK tdeui-shared ${XRANDR_LIBRARIES} ${XEXT_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/tdestyles/keramik/CMakeLists.txt b/tdestyles/keramik/CMakeLists.txt
index 8ee7c9730..ae536516e 100644
--- a/tdestyles/keramik/CMakeLists.txt
+++ b/tdestyles/keramik/CMakeLists.txt
@@ -65,6 +65,6 @@ set_source_files_properties( pixmaploader.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK tdefx-shared Xext
+  LINK tdefx-shared ${XEXT_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles
 )
diff --git a/tdeui/CMakeLists.txt b/tdeui/CMakeLists.txt
index d30bee930..581687833 100644
--- a/tdeui/CMakeLists.txt
+++ b/tdeui/CMakeLists.txt
@@ -148,7 +148,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 14.0.0
-  LINK tdecore-shared ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES}
+  LINK tdecore-shared ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} ${XEXT_LIBRARIES}
   DEPENDENCIES dcopidl
   DESTINATION ${LIB_INSTALL_DIR}
 )