[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36261] trunk/blender: cmake - install icons into $PREFIX/share/icons/hicolor/ rather then $PREFIX/share/pixmaps/, also move blender icon into 'apps' dir .

[Campbell Barton]

Revision: 36261
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36261
Author:   campbellbarton
Date:     2011-04-21 06:37:54 +0000 (Thu, 21 Apr 2011)
Log Message:
-----------
cmake - install icons into $PREFIX/share/icons/hicolor/ rather then $PREFIX/share/pixmaps/, also move blender icon into 'apps' dir.

Modified Paths:
--------------
    trunk/blender/source/creator/CMakeLists.txt

Added Paths:
-----------
    trunk/blender/release/freedesktop/icons/16x16/apps/
    trunk/blender/release/freedesktop/icons/16x16/apps/blender.png
    trunk/blender/release/freedesktop/icons/22x22/apps/
    trunk/blender/release/freedesktop/icons/22x22/apps/blender.png
    trunk/blender/release/freedesktop/icons/24x24/apps/
    trunk/blender/release/freedesktop/icons/24x24/apps/blender.png
    trunk/blender/release/freedesktop/icons/256x256/apps/
    trunk/blender/release/freedesktop/icons/256x256/apps/blender.png
    trunk/blender/release/freedesktop/icons/32x32/apps/
    trunk/blender/release/freedesktop/icons/32x32/apps/blender.png
    trunk/blender/release/freedesktop/icons/48x48/apps/
    trunk/blender/release/freedesktop/icons/48x48/apps/blender.png
    trunk/blender/release/freedesktop/icons/scalable/apps/
    trunk/blender/release/freedesktop/icons/scalable/apps/blender.svg

Removed Paths:
-------------
    trunk/blender/release/freedesktop/icons/16x16/blender.png
    trunk/blender/release/freedesktop/icons/22x22/blender.png
    trunk/blender/release/freedesktop/icons/24x24/blender.png
    trunk/blender/release/freedesktop/icons/256x256/blender.png
    trunk/blender/release/freedesktop/icons/32x32/blender.png
    trunk/blender/release/freedesktop/icons/48x48/blender.png
    trunk/blender/release/freedesktop/icons/scalable/blender.svg

Copied: trunk/blender/release/freedesktop/icons/16x16/apps/blender.png (from rev 36260, trunk/blender/release/freedesktop/icons/16x16/blender.png)
===================================================================
(Binary files differ)

Deleted: trunk/blender/release/freedesktop/icons/16x16/blender.png
===================================================================
(Binary files differ)

Copied: trunk/blender/release/freedesktop/icons/22x22/apps/blender.png (from rev 36260, trunk/blender/release/freedesktop/icons/22x22/blender.png)
===================================================================
(Binary files differ)

Deleted: trunk/blender/release/freedesktop/icons/22x22/blender.png
===================================================================
(Binary files differ)

Copied: trunk/blender/release/freedesktop/icons/24x24/apps/blender.png (from rev 36260, trunk/blender/release/freedesktop/icons/24x24/blender.png)
===================================================================
(Binary files differ)

Deleted: trunk/blender/release/freedesktop/icons/24x24/blender.png
===================================================================
(Binary files differ)

Copied: trunk/blender/release/freedesktop/icons/256x256/apps/blender.png (from rev 36260, trunk/blender/release/freedesktop/icons/256x256/blender.png)
===================================================================
(Binary files differ)

Deleted: trunk/blender/release/freedesktop/icons/256x256/blender.png
===================================================================
(Binary files differ)

Copied: trunk/blender/release/freedesktop/icons/32x32/apps/blender.png (from rev 36260, trunk/blender/release/freedesktop/icons/32x32/blender.png)
===================================================================
(Binary files differ)

Deleted: trunk/blender/release/freedesktop/icons/32x32/blender.png
===================================================================
(Binary files differ)

Copied: trunk/blender/release/freedesktop/icons/48x48/apps/blender.png (from rev 36260, trunk/blender/release/freedesktop/icons/48x48/blender.png)
===================================================================
(Binary files differ)

Deleted: trunk/blender/release/freedesktop/icons/48x48/blender.png
===================================================================
(Binary files differ)

Copied: trunk/blender/release/freedesktop/icons/scalable/apps/blender.svg (from rev 36240, trunk/blender/release/freedesktop/icons/scalable/blender.svg)
===================================================================
(Binary files differ)

Deleted: trunk/blender/release/freedesktop/icons/scalable/blender.svg
===================================================================
(Binary files differ)

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2011-04-21 06:27:39 UTC (rev 36260)
+++ trunk/blender/source/creator/CMakeLists.txt	2011-04-21 06:37:54 UTC (rev 36261)
@@ -253,7 +253,7 @@
 		install(
 			FILES
 			${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
-			${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/blender.svg
+			${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
 			${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
 			DESTINATION ${TARGETDIR}
 		)
@@ -290,10 +290,22 @@
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
 		)
 		install(
-			FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/blender.svg
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps
+			DIRECTORY
+					${CMAKE_SOURCE_DIR}/release/freedesktop/icons/16x16
+					${CMAKE_SOURCE_DIR}/release/freedesktop/icons/22x22
+					${CMAKE_SOURCE_DIR}/release/freedesktop/icons/24x24
+					${CMAKE_SOURCE_DIR}/release/freedesktop/icons/32x32
+					${CMAKE_SOURCE_DIR}/release/freedesktop/icons/48x48
+					${CMAKE_SOURCE_DIR}/release/freedesktop/icons/256x256
+			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/
+			PATTERN ".svn" EXCLUDE
+			PATTERN "*.svg" EXCLUDE
 		)
 		install(
+			FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
+			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps
+		)
+		install(
 			PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 		)