Hello

I'm proposing a small patch for kdeartwork (related to kscreensaver and its 
xscreensaver support).

In toplevel cmake there is macro_optional_find_library that creates cmake 
WITH_xscreensaver variable.
But, it's being used nowhere, and in kscreensaver (the only subproject that 
checks for it) introduces new variable WITH_Xscreensaver.
This tiny patch fixes this little ambiguity.

-- 
regards
MM


Dzwon tanio do wszystkich!
Sprawdz >> http://link.interia.pl/f1fa7
Index: kscreensaver/CMakeLists.txt
===================================================================
--- kscreensaver/CMakeLists.txt	(revision 891826)
+++ kscreensaver/CMakeLists.txt	(working copy)
@@ -1,5 +1,5 @@
 
-option(WITH_xscreensaver   "Enable support for xscreensaver" ON)
+option(WITH_Xscreensaver   "Enable support for xscreensaver" ON)
 
 find_path( KSCREENSAVER_INCLUDE_DIR kscreensaver.h
   PATHS ${KDE4_INCLUDE_DIR}
@@ -15,12 +15,12 @@
 	add_subdirectory( kdesavers ) 
 	add_subdirectory( kpartsaver ) 
 
-	if(WITH_xscreensaver)
+	if(WITH_Xscreensaver)
 	       	if(XSCREENSAVER_FOUND)
 		   add_subdirectory(kxsconfig)
 		   add_subdirectory(xsavers)
 	        endif(XSCREENSAVER_FOUND)
-	endif(WITH_xscreensaver)
+	endif(WITH_Xscreensaver)
 
 else(KSCREENSAVER_INCLUDE_DIR  AND  KSCREENSAVER_LIBRARY)
 	message(STATUS "kscreensaver can't be compiled. Please install kdebase before to compile it (need kscreensaver.h)")
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 891826)
+++ CMakeLists.txt	(working copy)
@@ -8,7 +8,7 @@
 include (MacroLibrary)
 include(MacroOptionalAddSubdirectory)
 
-macro_optional_find_package(Xscreensaver)
+find_package(Xscreensaver)
 macro_log_feature(XSCREENSAVER_FOUND "Xscreensaver" "A modular screen saver and locker for the X Window System" "ttp://www.jwz.org/xscreensaver" FALSE "" "Provides screen savers for the desktop.")
 
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} )

Attachment: signature.asc
Description: This is a digitally signed message part.

_______________________________________________
Kde-buildsystem mailing list
Kde-buildsystem@kde.org
https://mail.kde.org/mailman/listinfo/kde-buildsystem

Reply via email to