From 30c04cf29dd95d01a12ab389d6926f4857b141fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 5 Apr 2015 19:14:47 +0200 Subject: [PATCH] Add mit-shm extension support for CMake build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 5b95b86a5bbe9a4f558712b3e2173f90b7cd0dd5) --- CMakeLists.txt | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 332cd3db5..7013f8adf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,6 +89,7 @@ OPTION( WITH_LZMA "Enable support for LZMA/XZ" ${WITH_ALL_OPTIONS} ) OPTION( WITH_LIBBFD "Enable pretty backtraces with libbfd from GNU binutils" OFF ) OPTION( WITH_XRANDR "Build the krandr library" ON ) OPTION( WITH_XCOMPOSITE "Enable xcomposite support" ON ) +OPTION( WITH_MITSHM "Use MIT-SHM for pixmap loading/saving" ${WITH_ALL_OPTIONS} ) OPTION( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} ) OPTION( WITH_HSPELL "Enable hspell support" ${WITH_ALL_OPTIONS} ) @@ -666,15 +667,27 @@ if( WITH_XCOMPOSITE ) endif( WITH_XCOMPOSITE ) +##### check for mit-shm extension ################## + +if( WITH_MITSHM ) + tde_save_and_set( CMAKE_REQUIRED_FLAGS "-include X11/Xlib.h" ) + check_include_file( "X11/extensions/XShm.h" HAVE_MITSHM ) + tde_restore( CMAKE_REQUIRED_FLAGS ) + if( NOT HAVE_MITSHM ) + tde_message_fatal( "XShm extension is required, but was not found on your system" ) + endif( NOT HAVE_MITSHM ) +endif( WITH_MITSHM ) + + ##### check for xext ############################### -if( HAVE_XRENDER OR WITH_XCOMPOSITE OR WITH_XRANDR OR HAVE_X11_EXTENSIONS_SHAPE_H ) +if( HAVE_XRENDER OR WITH_XCOMPOSITE OR WITH_XRANDR OR HAVE_X11_EXTENSIONS_SHAPE_H OR WITH_MITSHM ) # xext (kdecore, kdeui, krandr, kstyles/keramik) pkg_search_module( XEXT xext ) if( NOT XEXT_FOUND ) tde_message_fatal( "xext is required, but was not found on your system" ) endif( ) -endif( HAVE_XRENDER OR WITH_XCOMPOSITE OR WITH_XRANDR OR HAVE_X11_EXTENSIONS_SHAPE_H ) +endif( HAVE_XRENDER OR WITH_XCOMPOSITE OR WITH_XRANDR OR HAVE_X11_EXTENSIONS_SHAPE_H OR WITH_MITSHM ) ##### check for libxml-2.0 ######################