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

List:       kde-commits
Subject:    KDE/kdeartwork
From:       Laurent Montel <montel () kde ! org>
Date:       2006-07-07 23:02:46
Message-ID: 1152313366.802873.12609.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 559658 by mlaurent:

Commit work made between Trysil and Paris
-> install IconThemes 
	(Where is kimage_compat ? need to generate animate picture into konqueror)
-> fix build of screensaver
-> add variable to define if we build with sound support (before ARTS now I add \
                KDE4_SOUND_SUPPORT ,perhaps renamed it to KDE4_PHONON_SUPPORT)
-> clean CMakeLists


 M  +2 -0      ConfigureChecks.cmake  
 M  +26 -0     IconThemes/CMakeLists.txt  
 M  +2 -0      config.h.cmake  
 M  +0 -14     emoticons/CMakeLists.txt  
 M  +16 -15    kscreensaver/kdesavers/CMakeLists.txt  


--- trunk/KDE/kdeartwork/ConfigureChecks.cmake #559657:559658
@@ -26,3 +26,5 @@
 
 check_include_files(memory.h HAVE_MEMORY_H)
 
+# now replace arts by phonon I think
+macro_bool_to_01(KDE4_SOUND_SUPPORT HAVE_ARTS) # kscreensaver
--- trunk/KDE/kdeartwork/IconThemes/CMakeLists.txt #559657:559658
@@ -1,7 +1,33 @@
 
+set(iconthemes Locolor ikons kdeclassic slick kids )
+set(installThemeDir ${DATA_INSTALL_DIR}/kthememgr/Themes )
 
+set(typeIcons actions  apps  devices  filesystems  mimetypes)
 
+set(sizeIcon 16x16  22x22  32x32  48x48 64x64)
 
+set(kdedir kde)
+
+foreach (_currentthemedir ${iconthemes})
+   	install(FILES ${_currentthemedir}/index.theme DESTINATION \
${installThemeDir}/${_currentthemedir} ) +   
+	foreach(_currentsize ${sizeIcon})
+		
+		foreach(_currenttypeicon ${typeIcons})
+			FILE(GLOB _pngfile \
"${_currentthemedir}/${_currentsize}/${_currenttypeicon}/*.png" ) +			install(FILES \
${_pngfile} DESTINATION \
${installThemeDir}/${_currentthemedir}/${_currentsize}/${_currenttypeicon}) \
+			FILE(GLOB _mngfile "*.mng") +			install(FILES ${_mngfile} DESTINATION \
${installThemeDir}/${_currentthemedir}/${_currentsize}/${_currenttypeicon}) +			# \
TODO fix it +			#foreach(_currentkdedir ${kdedir})
+			#	FILE(GLOB _kdeicons "*.png
+			#endforeach(_currentkdedir ${kdedir})		
+		endforeach(_currenttypeicon ${typeIcons})
+
+   	endforeach(_currentsize ${sizeIcon})
+
+endforeach(_currentthemedir ${iconthemes})
+
 ########### install files ###############
 
 install( FILES   DESTINATION  ${DATA_INSTALL_DIR}/kthememgr/Themes )
--- trunk/KDE/kdeartwork/config.h.cmake #559657:559658
@@ -13,3 +13,5 @@
 /* Defines where xscreensaver stores its graphic hacks */
 /* #undef XSCREENSAVER_HACKS_DIR */
 
+/* define if we want to compile with art support for the moment disable*/
+#cmakedefine HAVE_ARTS 1
--- trunk/KDE/kdeartwork/emoticons/CMakeLists.txt #559657:559658
@@ -13,17 +13,3 @@
 add_subdirectory( GroupWise ) 
 
 
-
-
-########### install files ###############
-
-
-
-
-
-#original Makefile.am contents follow:
-
-#SUBDIRS = ccmathteam.com greggman.com phpBB 	plain redones set1 \
-#	BoxedEmoticonSet 	KMess KMess-Blue KMess-Violet KMess-Cartoon \
-#	GroupWise
-#
--- trunk/KDE/kdeartwork/kscreensaver/kdesavers/CMakeLists.txt #559657:559658
@@ -1,6 +1,7 @@
 
 add_subdirectory( data ) 
 
+OPTION(KDE4_SOUND_SUPPORT "Build with sound support" OFF)
 
 
 
@@ -99,32 +100,32 @@
 
 ########### next target ###############
 
-#set($(X11_KSAVERS)_SRCS dummy.cpp )
+# X11 savers Make tests
+#set(kscience.kss_SRCS science.cpp )
 
-#kde4_automoc(${$(X11_KSAVERS)_SRCS})
+#kde4_automoc(${kscience.kss_SRCS})
 
-#file(WRITE dummy.cpp "//autogenerated file by cmake\n")
-#kde4_add_executable($(X11_KSAVERS) ${$(X11_KSAVERS)_SRCS})
+#kde4_add_executable(kscience.kss ${kscience.kss_SRCS})
 
-#target_link_libraries($(X11_KSAVERS)  ${KDE4_KDECORE_LIBS} )
+#target_link_libraries(kscience.kss  ${KDE4_KDECORE_LIBS} )
 
-#install(TARGETS $(X11_KSAVERS DESTINATION ${BIN_INSTALL_DIR} )
+#install(TARGETS kscience.kss DESTINATION ${BIN_INSTALL_DIR} )
 
 
 ########### next target ###############
+if(KDE4_SOUND_SUPPORT)
+ set(kclock.kss_SRCS kclock.cpp )
 
-#set($(LIBART_KSAVERS)_SRCS dummy.cpp )
+ kde4_automoc(${kclock.kss_SRCS})
 
-#kde4_automoc(${$(LIBART_KSAVERS)_SRCS})
+ kde4_add_executable(kclock.kss ${kclock.kss_SRCS})
 
-#file(WRITE dummy.cpp "//autogenerated file by cmake\n")
-#kde4_add_executable($(LIBART_KSAVERS) ${$(LIBART_KSAVERS)_SRCS})
+ target_link_libraries(kclock.kss  ${KDE4_KDECORE_LIBS} )
 
-#target_link_libraries($(LIBART_KSAVERS)  ${KDE4_KDECORE_LIBS} )
+ install(TARGETS kclock.kss DESTINATION ${BIN_INSTALL_DIR} )
+ install( FILES  KClock.desktop DESTINATION  ${SERVICES_INSTALL_DIR}/ScreenSavers )
+endif(KDE4_SOUND_SUPPORT);
 
-#install(TARGETS $(LIBART_KSAVERS DESTINATION ${BIN_INSTALL_DIR} )
-
-
 ########### next target ###############
 
 #set($(ARTS_GL_KSAVERS)_SRCS dummy.cpp )
@@ -156,7 +157,7 @@
 ########### install files ###############
 
 install( FILES kscience.png particle.png image.png  DESTINATION  \
                ${DATA_INSTALL_DIR}/kscreensaver )
-install( FILES KBanner.desktop KPolygon.desktop                 KSlideshow.desktop \
KLines-saver.desktop KLorenz.desktop                 KBlob.desktop KVm.desktop        \
KClock.desktop  DESTINATION  ${SERVICES_INSTALL_DIR}/ScreenSavers ) +install( FILES \
KBanner.desktop KPolygon.desktop KSlideshow.desktop KLines-saver.desktop \
KLorenz.desktop KBlob.desktop KVm.desktop DESTINATION  \
${SERVICES_INSTALL_DIR}/ScreenSavers )  
 MESSAGE(STATUS "readd it")
 #$(X11_DESKTOP_FILES) $(GL_DESKTOP_FILES) $(LIBART_DESKTOP_FILES) \
$(ARTS_GL_DESKTOP_FILES) )


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