Attachment #1634 for bug #1622

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1622
Collapse All | Expand All




      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( )

  if( NOT XSCREENSAVER_DIR )
    # The xscreensaver package is not required to build, only knowing where
    # to find the executables. Allow the user to define XSCREENSAVER_DIR.
    include( FindXscreensaver.cmake ) # not really good practice
    if( NOT XSCREENSAVER_FOUND )
      tde_message_fatal( 
        "xscreensaver is requested, but cmake can not determine the location of XSCREENSAVER_DIR. Either specify manually with -DXSCREENSAVER_DIR or ensure xscreensaver installed properly." )
    endif( )
  endif( )
endif( )


Return to bug 1622

Lines 155-169 Link Here

(-)tdebase/ConfigureChecks.cmake (-3 / +10 lines)
155	pkg_search_module( XSS xext )	155	pkg_search_module( XSS xext )
156	endif( )	156	endif( )
157	endif( )	157	endif( )
		158
158	check_include_file( X11/extensions/scrnsaver.h HAVE_XSCREENSAVER_H )	159	check_include_file( X11/extensions/scrnsaver.h HAVE_XSCREENSAVER_H )
159	if( HAVE_XSSLIB AND HAVE_XSCREENSAVER_H )	160	if( HAVE_XSSLIB AND HAVE_XSCREENSAVER_H )
160	set( HAVE_XSCREENSAVER 1 )	161	set( HAVE_XSCREENSAVER 1 )
161	else( )	162	else( )
162	tde_message_fatal( "xscreensaver is requested, but was not found on your system" )	163	tde_message_fatal( "xscreensaver is requested, but was not found on your system" )
163	endif( )	164	endif( )
164	include( FindXscreensaver.cmake ) # not really good practise	165
165	if( NOT XSCREENSAVER_FOUND )	166	if( NOT XSCREENSAVER_DIR )
166	message( FATAL_ERROR "\nxscreensaver is requested, but was not found on your system" )	167	# The xscreensaver package is not required to build, only knowing where
		168	# to find the executables. Allow the user to define XSCREENSAVER_DIR.
		169	include( FindXscreensaver.cmake ) # not really good practice
		170	if( NOT XSCREENSAVER_FOUND )
		171	tde_message_fatal(
		172	"xscreensaver is requested, but cmake can not determine the location of XSCREENSAVER_DIR. Either specify manually with -DXSCREENSAVER_DIR or ensure xscreensaver installed properly." )
		173	endif( )
167	endif( )	174	endif( )
168	endif( )	175	endif( )
169		176

Lines 73-78 Link Here

(-)tdebase/CMakeLists.txt (+2 lines)
73	option( WITH_XTEST "Enable xtest support" ${WITH_ALL_OPTIONS} )	73	option( WITH_XTEST "Enable xtest support" ${WITH_ALL_OPTIONS} )
74	option( WITH_OPENGL "Enable openGL support" ${WITH_ALL_OPTIONS} )	74	option( WITH_OPENGL "Enable openGL support" ${WITH_ALL_OPTIONS} )
75	option( WITH_XSCREENSAVER "Enable xscreensaver support" ${WITH_ALL_OPTIONS} )	75	option( WITH_XSCREENSAVER "Enable xscreensaver support" ${WITH_ALL_OPTIONS} )
		76	option( WITH_XSCREENSAVER_DIR "Optional xscreensaver directory" OFF )
76	option( WITH_LIBART "Enable libart support (for SVG icons and wallpapers)" ${WITH_ALL_OPTIONS} )	77	option( WITH_LIBART "Enable libart support (for SVG icons and wallpapers)" ${WITH_ALL_OPTIONS} )
77	option( WITH_LIBUSB "Enable control of some mouse models through libusb" ${WITH_ALL_OPTIONS} )	78	option( WITH_LIBUSB "Enable control of some mouse models through libusb" ${WITH_ALL_OPTIONS} )
78	option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw1394" ${WITH_ALL_OPTIONS} )	79	option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw1394" ${WITH_ALL_OPTIONS} )
Lines 109-114 Link Here
109	# xkb initialization fails.	110	# xkb initialization fails.
110	# WITH_XTEST affects tdm kxkb khotkeys	111	# WITH_XTEST affects tdm kxkb khotkeys
111	# WITH_XSCREENSAVER affects kdesktop	112	# WITH_XSCREENSAVER affects kdesktop
		113	# WITH_XSCREENSAVER_DIR optional xscreensaver location
112	# WITH_LIBART affects tdm kcontrol(icons background)	114	# WITH_LIBART affects tdm kcontrol(icons background)
113	# WITH_LIBUSB affects kcontrol(input)	115	# WITH_LIBUSB affects kcontrol(input)
114	# WITH_XDMCP affects tdm	116	# WITH_XDMCP affects tdm