From 0efb8a18d45f2432c9c796aa5ef7af3f124967ea Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Fri, 27 Apr 2012 23:24:31 -0500 Subject: GCC 4.7 fix. This partially resolves bug report 958. Thanks to David C. Rankin and Serghei Amelian. --- ksnapshot/CMakeLists.txt | 2 +- ksnapshot/ConfigureChecks.cmake | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ksnapshot/CMakeLists.txt b/ksnapshot/CMakeLists.txt index 24a7945c..a9b0fcdd 100644 --- a/ksnapshot/CMakeLists.txt +++ b/ksnapshot/CMakeLists.txt @@ -40,6 +40,6 @@ tde_add_executable( ksnapshot AUTOMOC SOURCES ksnapshotiface.skel main.cpp ksnapshot.cpp regiongrabber.cpp windowgrabber.cpp ksnapshotwidget.ui - LINK tdeprint-shared + LINK tdeprint-shared ${XEXT_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/ksnapshot/ConfigureChecks.cmake b/ksnapshot/ConfigureChecks.cmake index d9a7dd4a..469ba23d 100644 --- a/ksnapshot/ConfigureChecks.cmake +++ b/ksnapshot/ConfigureChecks.cmake @@ -9,4 +9,13 @@ # ################################################# -check_include_file( X11/extensions/shape.h HAVE_X11_EXTENSIONS_SHAPE_H ) +## test for and explicitly include libXext +if( WITH_XEXT ) + pkg_search_module( XEXT xext ) + if( XEXT_FOUND ) + check_include_file( "X11/extensions/shape.h" HAVE_X11_EXTENSIONS_SHAPE_H ) + endif( ) + if( NOT XEXT_FOUND ) + tde_message_fatal( "You requested Xext support, but was not found on your system." ) + endif( ) +endif( ) -- cgit v1.2.1