diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2015-04-05 19:13:40 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-12-23 02:22:58 +0100 |
| commit | 63f24fa8785ab839aa8ca3169cab6ab6e2aa5256 (patch) | |
| tree | 2859b3e109016364f216f1e5a79054829595bd5b /CMakeLists.txt | |
| parent | 787d3a348bee5032e5d71d417d2b74163c30d719 (diff) | |
| download | tdelibs-63f24fa8785ab839aa8ca3169cab6ab6e2aa5256.tar.gz tdelibs-63f24fa8785ab839aa8ca3169cab6ab6e2aa5256.zip | |
Fix xext configure check for CMake build
This resolves Bug 2410
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit c80f418abf9c3061b0fb7759a1e560a0ab1243fe)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cf6478918..332cd3db5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -653,6 +653,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 ) @@ -662,13 +663,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 (krandr, kstyles/keramik, kdeui) +##### check for xext ############################### + +if( HAVE_XRENDER OR WITH_XCOMPOSITE OR WITH_XRANDR OR HAVE_X11_EXTENSIONS_SHAPE_H ) + # xext (kdecore, kdeui, krandr, kstyles/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 ###################### |