Attachment 1462 Details for Bug 1622 – tdebase-bug-1622-enhance-xscreensaver-directory-detection.patch

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.

[patch] tdebase-bug-1622-enhance-xscreensaver-directory-detection.patch

tdebase-bug-1622-enhance-xscreensaver-directory-detection.patch (text/plain), 1.34 KB, created by Alexander Golubev (Fat-Zer) on 2013-08-12 20:22:25 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Golubev (Fat-Zer)

Created: 2013-08-12 20:22:25 CDT

Size: 1.34 KB

patch

obsolete

>diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
>index 06087ba..34ac70b 100644
>--- a/ConfigureChecks.cmake
>+++ b/ConfigureChecks.cmake
>@@ -155,15 +155,25 @@ if( WITH_XSCREENSAVER )
>       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( )
>-  include( FindXscreensaver.cmake ) # not really good practise
>-  if( NOT XSCREENSAVER_FOUND )
>-    message( FATAL_ERROR "\nxscreensaver is requested, but was not found on your system" )
>+
>+  if( NOT XSCREENSAVER_DIR )
>+    # We don't really need the xscreensaver package for build, we only must know 
>+    # there xscreensaver stores its executables. So leave user the posibility 
>+    # to define XSCREENSAVER_DIR to so let the user.
>+  	include( FindXscreensaver.cmake ) # not really good practise
>+    if( NOT XSCREENSAVER_FOUND )
>+      tde_message_fatal( 
>+        "xscreensaver is requested, but cmake can not determine the location of XSCREENSAVER_DIR
>+ You have to either specify it manually with e.g. -DXSCREENSAVER_DIR=/usr/lib/misc/xscreensaver/
>+ or make sure that xscreensaver installed properly" )
>+    endif( )
>   endif( )
> endif( )
>

Actions: View | Diff

Attachments on bug 1622: 1462 | 1634 | 2020