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

List:       kde-commits
Subject:    KDE/kdeartwork
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2008-12-04 20:11:38
Message-ID: 1228421498.441513.13137.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 892639 by neundorf:

-move the check for Xscreensaver into kscreensaver/CMakeLists.txt, so it is quite \
                nice almost modular
-just test for XSCREENSAVER_FOUND, this will only be true if WITH_Xscreensaver is \
                enabled and it has been found
-don't go into subdir cmake, there is no CMakeLists.txt there
-don't include that extra macro, it's part of MacroLibrary.cmake


Alex

CCMAIL: reavertm@poczta.fm



 M  +1 -6      CMakeLists.txt  
 M  +7 -6      kscreensaver/CMakeLists.txt  


--- trunk/KDE/kdeartwork/CMakeLists.txt #892638:892639
@@ -6,11 +6,7 @@
 find_package(KDE4 REQUIRED)
 include (KDE4Defaults)
 include (MacroLibrary)
-include(MacroOptionalAddSubdirectory)
 
-macro_optional_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} )
 include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
 
@@ -20,7 +16,7 @@
 macro_optional_add_subdirectory(emoticons)
 if (Q_WS_X11)
    macro_optional_add_subdirectory(kscreensaver)
-   MESSAGE(STATUS "Remember to readd kwin-style when ported")
+   message(STATUS "Remember to readd kwin-style when ported")
    #macro_optional_add_subdirectory(kwin-styles)
    macro_optional_add_subdirectory(icewm-themes)
 endif (Q_WS_X11)
@@ -29,7 +25,6 @@
 macro_optional_add_subdirectory(sounds)
 macro_optional_add_subdirectory(styles)
 macro_optional_add_subdirectory(wallpapers)
-add_subdirectory( cmake )
 
 
 macro_display_feature_log()
--- trunk/KDE/kdeartwork/kscreensaver/CMakeLists.txt #892638:892639
@@ -1,18 +1,19 @@
 
 find_package(KDE4Workspace)
 
+macro_optional_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.") +
 if(KDE4WORKSPACE_FOUND)
 	macro_optional_find_package(OpenGL)
 	macro_log_feature(OPENGL_FOUND "OpenGL" "API for developing portable, interactive \
2D and 3D graphics applications" "http://mesa3d.sourceforge.net" FALSE "" "Provides \
3D screensavers.")  add_subdirectory( kdesavers ) 
 	add_subdirectory( kpartsaver ) 
 
-	if(WITH_Xscreensaver)
-	       	if(XSCREENSAVER_FOUND)
-		   add_subdirectory(kxsconfig)
-		   add_subdirectory(xsavers)
-	        endif(XSCREENSAVER_FOUND)
-	endif(WITH_Xscreensaver)
+       	if(XSCREENSAVER_FOUND)
+	   add_subdirectory(kxsconfig)
+	   add_subdirectory(xsavers)
+        endif(XSCREENSAVER_FOUND)
 
 elseif(KDE4WORKSPACE_FOUND)
 	message(STATUS "kscreensaver can't be compiled. Please install kdebase/workspace \
before to compile it (need kscreensaver.h)")


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