From c80f418abf9c3061b0fb7759a1e560a0ab1243fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 5 Apr 2015 19:13:40 +0200 Subject: [PATCH] Fix xext configure check for CMake build This resolves Bug 2410 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- CMakeLists.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f43dcb746..8916b74e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -690,6 +690,7 @@ else( XRENDER_FOUND) message(FATAL_ERROR "\nxrender support is required, but not found on your system" ) endif( XRENDER_FOUND ) + ##### check for xcomposite ######################### if( WITH_XCOMPOSITE ) @@ -699,13 +700,18 @@ if( WITH_XCOMPOSITE ) else( WITH_XCOMPOSITE ) tde_message_fatal( "xcomposite support was requested, but xcomposite was not found on your system" ) endif( XCOMPOSITE_FOUND ) +endif( WITH_XCOMPOSITE ) + - # xext (tderandr, tdestyles/keramik, tdeui) +##### check for xext ############################### + +if( HAVE_XRENDER OR WITH_XCOMPOSITE OR WITH_XRANDR OR HAVE_X11_EXTENSIONS_SHAPE_H ) + # xext (tdecore, tdeui, tderandr, tdestyles/keramik) 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" ) + tde_message_fatal( "xext is required, but was not found on your system" ) endif( ) -endif( WITH_XCOMPOSITE ) +endif( HAVE_XRENDER OR WITH_XCOMPOSITE OR WITH_XRANDR OR HAVE_X11_EXTENSIONS_SHAPE_H ) ##### check for libxml-2.0 ######################