[Uml-devel] KDE/kdesdk

Mon Aug 14 13:32:55 UTC 2006

SVN commit 572971 by mlaurent:

Adapt with new KDE4_INSTALL_ICONS
(automatic detect of icons theme)



 M  +1 -1      cervisia/CMakeLists.txt  
 M  +1 -1      cervisia/pics/CMakeLists.txt  
 M  +1 -1      cmake/scripts/am2cmake  
 M  +1 -1      kbabel/catalogmanager/CMakeLists.txt  
 M  +1 -2      kbabel/catalogmanager/icons/CMakeLists.txt  
 M  +1 -1      kbabel/kbabel/CMakeLists.txt  
 M  +1 -2      kbabel/kbabel/icons/CMakeLists.txt  
 M  +1 -1      kbabel/kbabeldict/CMakeLists.txt  
 M  +1 -2      kbugbuster/CMakeLists.txt  
 M  +1 -2      kcachegrind/kcachegrind/CMakeLists.txt  
 M  +1 -1      kcachegrind/pics/hicolor/CMakeLists.txt  
 M  +1 -1      kioslave/svn/icons/CMakeLists.txt  
 M  +1 -1      kompare/pics/CMakeLists.txt  
 M  +1 -1      kuiviewer/CMakeLists.txt  
 M  +1 -1      umbrello/umbrello/CMakeLists.txt  
 M  +1 -1      umbrello/umbrello/pics/CMakeLists.txt

--- trunk/KDE/kdesdk/cervisia/CMakeLists.txt #572970:572971
@@ -109,7 +109,7 @@
 install( FILES cervisia.upd  DESTINATION  ${KCONF_UPDATE_INSTALL_DIR} )
 install(PROGRAMS FILES change_colors.pl cervisia-normalize_cvsroot.pl cervisia-change_repos_list.pl DESTINATION  ${KCONF_UPDATE_INSTALL_DIR} )
 
-kde4_install_icons( ${ICON_INSTALL_DIR}  hicolor )
+kde4_install_icons( ${ICON_INSTALL_DIR}   )
 
 
 
--- trunk/KDE/kdesdk/cervisia/pics/CMakeLists.txt #572970:572971
@@ -1,4 +1,4 @@
 
 
-kde4_install_icons( ${ICON_INSTALL_DIR}  hicolor )
+kde4_install_icons( ${ICON_INSTALL_DIR}   )
 
--- trunk/KDE/kdesdk/cmake/scripts/am2cmake #572970:572971
@@ -974,7 +974,7 @@
 
       if @installIcons
          #add a default theme (not perfect for convert but enough to avoid pb
-		 file.printf("kde4_install_icons( ${ICON_INSTALL_DIR}  %s )\n\n", at iconDir )
+		 file.printf("kde4_install_icons( ${ICON_INSTALL_DIR} )\n\n" )
       end
 
       if @createDoxygenDocs
--- trunk/KDE/kdesdk/kbabel/catalogmanager/CMakeLists.txt #572970:572971
@@ -63,7 +63,7 @@
 install( FILES catalogmanager.desktop  DESTINATION  ${XDG_APPS_DIR} )
 install( FILES catalogmanagerui.rc  DESTINATION  ${DATA_INSTALL_DIR}/catalogmanager )
 
-kde4_install_icons( ${ICON_INSTALL_DIR}  hicolor )
+kde4_install_icons( ${ICON_INSTALL_DIR}   )
 
 
 
--- trunk/KDE/kdesdk/kbabel/catalogmanager/icons/CMakeLists.txt #572970:572971
@@ -1,4 +1,3 @@
 
-kde4_install_icons( ${DATA_INSTALL_DIR}/kbabel/icons hicolor)
-kde4_install_icons( ${DATA_INSTALL_DIR}/kbabel/icons locolor)
+kde4_install_icons( ${DATA_INSTALL_DIR}/kbabel/icons )
 
--- trunk/KDE/kdesdk/kbabel/kbabel/CMakeLists.txt #572970:572971
@@ -81,7 +81,7 @@
 install( FILES kbabelui.rc  DESTINATION  ${DATA_INSTALL_DIR}/kbabel )
 install( FILES kbabel-project.upd kbabel-difftoproject.upd  DESTINATION  ${KCONF_UPDATE_INSTALL_DIR} )
 
-kde4_install_icons( ${ICON_INSTALL_DIR}  hicolor )
+kde4_install_icons( ${ICON_INSTALL_DIR}   )
 
 
 
--- trunk/KDE/kdesdk/kbabel/kbabel/icons/CMakeLists.txt #572970:572971
@@ -1,2 +1 @@
-kde4_install_icons( ${DATA_INSTALL_DIR}/kbabel/icons hicolor )
-kde4_install_icons( ${DATA_INSTALL_DIR}/kbabel/icons locolor )
+kde4_install_icons( ${DATA_INSTALL_DIR}/kbabel/icons  )
--- trunk/KDE/kdesdk/kbabel/kbabeldict/CMakeLists.txt #572970:572971
@@ -43,7 +43,7 @@
 install( FILES searchengine.h kbabeldictbox.h kbabeldictiface.h
     dictionarymenu.h dictchooser.h DESTINATION ${INCLUDE_INSTALL_DIR} )
 
-kde4_install_icons( ${ICON_INSTALL_DIR}  hicolor )
+kde4_install_icons( ${ICON_INSTALL_DIR}   )
 
 
 
--- trunk/KDE/kdesdk/kbugbuster/CMakeLists.txt #572970:572971
@@ -83,6 +83,5 @@
 
 install( FILES kbugbuster.desktop  DESTINATION  ${XDG_APPS_DIR} )
 
-kde4_install_icons( ${ICON_INSTALL_DIR}  hicolor )
-kde4_install_icons( ${ICON_INSTALL_DIR}  locolor )
+kde4_install_icons( ${ICON_INSTALL_DIR}   )
 
--- trunk/KDE/kdesdk/kcachegrind/kcachegrind/CMakeLists.txt #572970:572971
@@ -68,7 +68,6 @@
 install( FILES kcachegrindui.rc  DESTINATION  ${DATA_INSTALL_DIR}/kcachegrind )
 install( FILES x-kcachegrind.desktop  DESTINATION  ${MIME_INSTALL_DIR}/application )
 
-kde4_install_icons( ${ICON_INSTALL_DIR}  hicolor )
-kde4_install_icons( ${ICON_INSTALL_DIR}  locolor )
+kde4_install_icons( ${ICON_INSTALL_DIR}   )
 
 
--- trunk/KDE/kdesdk/kcachegrind/pics/hicolor/CMakeLists.txt #572970:572971
@@ -1 +1 @@
-kde4_install_icons( ${DATA_INSTALL_DIR}/kcachegrind/icons hicolor )
+kde4_install_icons( ${DATA_INSTALL_DIR}/kcachegrind/icons  )
--- trunk/KDE/kdesdk/kioslave/svn/icons/CMakeLists.txt #572970:572971
@@ -1,2 +1,2 @@
 
-kde4_install_icons( ${ICON_INSTALL_DIR}  crystalsvg )
+kde4_install_icons( ${ICON_INSTALL_DIR}   )
--- trunk/KDE/kdesdk/kompare/pics/CMakeLists.txt #572970:572971
@@ -1,5 +1,5 @@
 
-kde4_install_icons( ${ICON_INSTALL_DIR}  hicolor )
+kde4_install_icons( ${ICON_INSTALL_DIR}   )
 
 
 
--- trunk/KDE/kdesdk/kuiviewer/CMakeLists.txt #572970:572971
@@ -53,7 +53,7 @@
 install( FILES kuiviewerui.rc  DESTINATION  ${DATA_INSTALL_DIR}/kuiviewer )
 install( FILES designerthumbnail.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
 
-kde4_install_icons( ${ICON_INSTALL_DIR}  hicolor )
+kde4_install_icons( ${ICON_INSTALL_DIR}   )
 
 
 
--- trunk/KDE/kdesdk/umbrello/umbrello/CMakeLists.txt #572970:572971
@@ -308,7 +308,7 @@
 install( FILES tips umbrelloui.rc  DESTINATION  ${DATA_INSTALL_DIR}/umbrello )
 install( FILES x-umbrello.desktop  DESTINATION  ${MIME_INSTALL_DIR}/application )
 
-kde4_install_icons( ${ICON_INSTALL_DIR}  hicolor )
+kde4_install_icons( ${ICON_INSTALL_DIR}   )
 
 
 
--- trunk/KDE/kdesdk/umbrello/umbrello/pics/CMakeLists.txt #572970:572971
@@ -1,5 +1,5 @@
 
 install( FILES actor.png  aggregation.png  align_left.png  align_right.png  align_top.png  align_bottom.png  align_vert_middle.png  align_hori_middle.png  align_vert_distribute.png  align_hori_distribute.png  anchor.png  andline.png  arrow.png  association.png  choice-rhomb.png  choice-round.png  component.png  composition.png  containment.png  CVglobal_meth.png  CVglobal_var.png  CVimplementation_meth.png  CVimplementation_signal.png  CVimplementation_slot.png  CVimplementation_var.png  CVnamespace.png  CVprivate_meth.png  CVprivate_signal.png  CVprivate_slot.png  CVprivate_var.png  CVprotected_meth.png  CVprotected_signal.png  CVprotected_slot.png  CVprotected_var.png  CVpublic_meth.png  CVpublic_signal.png  CVpublic_slot.png  CVpublic_var.png  CVstruct.png  deep-history.png  shallow-history.png  dependency.png  end_state.png  generalisation.png  initial_state.png  interface.png  join.png  junction.png  datatype.png  enum.png  message-synchronous.png  message-asynchronous.png  note.png  object.png  startlogo.png  template.png  text.png  class.png  uniassociation.png  usecase.png  branch.png  fork.png  state-fork.png  package.png  artifact.png  box.png  node.png  entity.png  relationship.png  subsystem.png cursor-actor.png  cursor-andline.png  cursor-choice-rhomb.png  cursor-choice-round.png  cursor-deep-history.png  cursor-join.png  cursor-junction.png  cursor-shallow-history.png  cursor-state-fork.png  cursor-usecase.png  cursor-initial_state.png  cursor-package.png  cursor-aggregation.png  cursor-component.png  cursor-containment.png  cursor-interface.png  cursor-datatype.png  cursor-enum.png  cursor-text.png  cursor-anchor.png  cursor-composition.png  cursor-message-asynchronous.png  cursor-class.png  cursor-artifact.png  cursor-dependency.png  cursor-message-synchronous.png  cursor-uniassociation.png  cursor-association.png  cursor-end_state.png  cursor-node.png  cursor-box.png  cursor-fork.png  cursor-note.png  cursor-branch.png  cursor-generalisation.png  cursor-object.png  cursor-entity.png  cursor-relationship.png  DESTINATION  ${DATA_INSTALL_DIR}/umbrello/pics )
 
-kde4_install_icons( ${ICON_INSTALL_DIR}  crystalsvg )
+kde4_install_icons( ${ICON_INSTALL_DIR}   )
 


