diff --git a/CMakeLists.txt b/CMakeLists.txt index 5802ae577f..544860af65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,6 +103,13 @@ install( FILES org.kde.KWin.xml DESTINATION ${DBUS_INTERFACES_DIR} ) kde4_install_icons( ${ICON_INSTALL_DIR} ) - -SET(KWIN_COMPOSITE_ENABLED X11_Xrender_FOUND AND X11_Xcomposite_FOUND) -macro_log_feature(KWIN_COMPOSITE_ENABLED "Compositing support" "XRender and XComposite extensions are required for KWin compositing support" "http://www.x.org/") +# cmake apparently doesn't allow nested ()'s in if(), so write as multiple if()'s +if( X11_Xcomposite_FOUND AND X11_Xdamage_FOUND ) + if( OPENGL_FOUND ) + SET(KWIN_COMPOSITE_ENABLED TRUE) + endif( OPENGL_FOUND ) + if( X11_Xrender_FOUND AND X11_Xfixes_FOUND ) + SET(KWIN_COMPOSITE_ENABLED TRUE) + endif( X11_Xrender_FOUND AND X11_Xfixes_FOUND ) +endif( X11_Xcomposite_FOUND AND X11_Xdamage_FOUND ) +macro_log_feature(KWIN_COMPOSITE_ENABLED "Compositing support" "XComposite and XDamage extensions and OpenGL or XRender with XFixes are required for KWin compositing support" "http://www.x.org/")