Added XCOMPOSITE and XDAMAGE checks to CMake rules.

Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
pull/1/head
Mavridis Philippe 4 years ago
parent 08cff8ad05
commit d3a391bcd6
No known key found for this signature in database
GPG Key ID: F8D2D7E2F989A494

@ -48,6 +48,7 @@ tde_setup_paths( )
option( WITH_ALL_OPTIONS "Enable all optional support" OFF ) option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
option( WITH_XCOMPOSITE "Enable xcomposite support" ON )
##### user requested modules #################### ##### user requested modules ####################

@ -33,6 +33,22 @@ endif( WITH_GCC_VISIBILITY )
find_package( X11 ) find_package( X11 )
##### check for XCOMPOSITE and XDAMAGE (needed for XCOMPOSITE)
if( WITH_XCOMPOSITE )
pkg_search_module( XDAMAGE xdamage )
if( NOT XDAMAGE_FOUND )
tde_message_fatal( "xcomposite support was requested, but xdamage was not found on your system" )
endif()
pkg_search_module( XCOMPOSITE xcomposite )
if( XCOMPOSITE_FOUND )
set( COMPOSITE 1 )
else()
tde_message_fatal( "xcomposite support was requested, but xcomposite was not found on your system" )
endif()
endif( WITH_XCOMPOSITE )
##### check for imlib2 ##### check for imlib2
pkg_search_module( IMLIB2 imlib2 ) pkg_search_module( IMLIB2 imlib2 )

@ -10,3 +10,6 @@
/* Defined if you don't have either the XTest headers or /* Defined if you don't have either the XTest headers or
the xcb-util-keysyms headers */ the xcb-util-keysyms headers */
#cmakedefine NO_XTEST_EXTENSION 1 #cmakedefine NO_XTEST_EXTENSION 1
// Defined if you have both XComposite and XDamage.
#cmakedefine COMPOSITE 1

@ -28,6 +28,8 @@ tde_add_executable( ${PROJECT_NAME} AUTOMOC
tdecore-shared tdecore-shared
tdeui-shared tdeui-shared
${IMLIB2_LIBRARIES} ${IMLIB2_LIBRARIES}
${XDAMAGE_LIBRARIES}
${XCOMPOSITE_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

Loading…
Cancel
Save