diff options
| author | Darrell Anderson <[email protected]> | 2012-04-27 23:24:31 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-04-27 23:24:31 -0500 |
| commit | 0efb8a18d45f2432c9c796aa5ef7af3f124967ea (patch) | |
| tree | eb3903338e5ea8f1ab10de7095125197dc90ff9b | |
| parent | 5ad5528b30fecd30c2cfdd25cb515385b84e1bfd (diff) | |
| download | tdegraphics-0efb8a18d45f2432c9c796aa5ef7af3f124967ea.tar.gz tdegraphics-0efb8a18d45f2432c9c796aa5ef7af3f124967ea.zip | |
GCC 4.7 fix.
This partially resolves bug report 958.
Thanks to David C. Rankin and Serghei Amelian.
| -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 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( ) |