summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGolubev Alexander <fatzer2@gmail.com>2013-08-13 05:26:51 +0400
committerSlávek Banko <slavek.banko@axis.cz>2014-04-29 01:44:48 +0200
commit9fb2cb290edabb9b2f382256d8370adc5ae73a50 (patch)
tree6f261185c69deb3537d5e9fc0371d603ec84a572
parentccb5fcaf675122fae8ed05e5f1d956d0253ceb2c (diff)
downloadtdebase-9fb2cb290edabb9b2f382256d8370adc5ae73a50.tar.gz
tdebase-9fb2cb290edabb9b2f382256d8370adc5ae73a50.zip
Enhance xscreensaver directory detection
This resolves Bug 1622
-rw-r--r--ConfigureChecks.cmake12
1 files changed, 10 insertions, 2 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 9dfb6d137..ca0e235b0 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -172,15 +172,23 @@ 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( )
+
+ # 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 )
- message( FATAL_ERROR "\nxscreensaver is requested, but was not found on your system" )
+ if( NOT XSCREENSAVER_DIR )
+ 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( )