diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-04-27 23:24:31 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 19:30:10 +0200 |
| commit | a2ce1572ad5512ef88d6edd96ed95b436534177d (patch) | |
| tree | 3ba6fd1ffbbc93a2470a18bcd68bac6c48c110a9 | |
| parent | 23387cd0bd8c4c203cb1d09d55a051666d1f14cb (diff) | |
| download | tdegraphics-a2ce1572ad5512ef88d6edd96ed95b436534177d.tar.gz tdegraphics-a2ce1572ad5512ef88d6edd96ed95b436534177d.zip | |
GCC 4.7 fix.
This partially resolves bug report 958.
Thanks to David C. Rankin and Serghei Amelian.
(cherry picked from commit 0efb8a18d45f2432c9c796aa5ef7af3f124967ea)
| -rw-r--r-- | ksnapshot/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ksnapshot/ConfigureChecks.cmake | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/ksnapshot/CMakeLists.txt b/ksnapshot/CMakeLists.txt index b5d5fd3e..d5b2db59 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 kdeprint-shared + LINK kdeprint-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( ) |