Browse Source

Add xscreensaver support to CMake

This closes Bug 859
(cherry picked from commit 80deb52955)
v3.5.13-sru
Slávek Banko 10 years ago
parent
commit
0c7737264e
  1. 1
      CMakeLists.txt
  2. 20
      ConfigureChecks.cmake
  3. 3
      config.h.cmake
  4. 1
      kdesktop/CMakeLists.txt

1
CMakeLists.txt

@ -66,6 +66,7 @@ option( WITH_XRENDER "Enable xrender support" OFF )
option( WITH_XDAMAGE "Enable xdamage support" OFF )
option( WITH_XEXT "Enable xext support" OFF )
option( WITH_XTEST "Enable xext support" OFF )
option( WITH_XSCREENSAVER "Enable xscreensaver support" OFF )
option( WITH_LIBART "Enable libart support (for SVG icons and wallpapers)" OFF )
option( WITH_LIBUSB "Enable control of some mouse models through libusb" OFF )
option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw1394" OFF )

20
ConfigureChecks.cmake

@ -130,6 +130,26 @@ if( WITH_XTEST )
endif( )
# xscreensaver ()
if( WITH_XSCREENSAVER )
check_library_exists( Xss XScreenSaverQueryInfo "" HAVE_XSSLIB )
if( HAVE_XSSLIB )
pkg_search_module( XSS xscrnsaver )
else( )
check_library_exists( Xext XScreenSaverQueryInfo "" HAVE_XSSLIB )
if( HAVE_XSSLIB )
pkg_search_module( XSS xext )
endif( )
endif( )
check_include_file( X11/extensions/scrnsaver.h HAVE_XSCREENSAVER_H )
if( HAVE_XSSLIB AND HAVE_XSCREENSAVER_H )
set( HAVE_XSCREENSAVER 1 )
else( )
tde_message_fatal( "xscreensaver is requested, but was not found on your system" )
endif( )
endif( )
# GL
if( BUILD_KDESKTOP OR BUILD_KCONTROL OR BUILD_KSCREENSAVER )
check_library_exists( GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL )

3
config.h.cmake

@ -18,6 +18,9 @@
// kxkb
#cmakedefine HAVE_XTEST 1
// xscreensaver
#cmakedefine HAVE_XSCREENSAVER 1
// libart
#cmakedefine HAVE_LIBART 1

1
kdesktop/CMakeLists.txt

@ -94,6 +94,7 @@ tde_add_kdeinit_executable( ${target} AUTOMOC
kdesktopsettings-static bgnd-static dmctl-static
konq-shared kutils-shared
${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext dl
${XSS_LIBRARIES}
)

Loading…
Cancel
Save