[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeartwork/cmake/modules
From:       Laurent Montel <montel () kde ! org>
Date:       2007-01-25 17:18:43
Message-ID: 1169745523.953534.26232.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 627094 by mlaurent:

Fix check xscreensaver dir


 M  +16 -1     FindXscreensaver.cmake  


--- trunk/KDE/kdeartwork/cmake/modules/FindXscreensaver.cmake #627093:627094
@@ -20,7 +20,12 @@
    /usr/openwin/lib/xscreensaver/
    /etc/
 )
+if( XSCREENSAVER_DIR)
+   set(XSCREENSAVER_DIR ${XSCREENSAVER_DIR}/lib${LIB_SUFFIX}/xscreensaver/)
+endif(XSCREENSAVER_DIR)
 
+
+
 if(NOT XSCREENSAVER_DIR)
 FIND_PATH(XSCREENSAVER_DIR lib/xscreensaver/flame
    ${KDE4_INCLUDE_DIR}
@@ -35,7 +40,10 @@
    /usr/local/xscreensaver/
    /usr/openwin/lib/xscreensaver/
    /etc/
-)	
+)
+if( XSCREENSAVER_DIR)
+   set(XSCREENSAVER_DIR ${XSCREENSAVER_DIR}/lib/xscreensaver/)	
+endif(XSCREENSAVER_DIR)
 endif(NOT XSCREENSAVER_DIR)
 
 if(NOT XSCREENSAVER_DIR)
@@ -53,6 +61,10 @@
    /usr/openwin/lib/xscreensaver/
    /etc/
 )
+if( XSCREENSAVER_DIR)
+	set(XSCREENSAVER_DIR ${XSCREENSAVER_DIR}/bin/xscreensaver-hacks/)
+endif(XSCREENSAVER_DIR)
+
 endif(NOT XSCREENSAVER_DIR)
 
 if(NOT XSCREENSAVER_DIR)
@@ -70,6 +82,9 @@
    /usr/openwin/lib/xscreensaver/
    /etc/
 )
+if( XSCREENSAVER_DIR)
+        set(XSCREENSAVER_DIR ${XSCREENSAVER_DIR}/hacks/)
+endif(XSCREENSAVER_DIR)
 endif(NOT XSCREENSAVER_DIR)
 
 
[prev in list] [next in list] [prev in thread] [next in thread]