cmake - install icons into $PREFIX/share/icons/hicolor/ rather then $PREFIX/share/pixmaps/, also move blender icon into 'apps' dir.

8 files changed, 15 insertions, 3 deletions

diff --git a/release/freedesktop/icons/16x16/blender.png b/release/freedesktop/icons/16x16/apps/blender.png
index a80352540fa..a80352540fa 100644
--- a/release/freedesktop/icons/16x16/blender.png
+++ b/release/freedesktop/icons/16x16/apps/blender.png
diff --git a/release/freedesktop/icons/22x22/blender.png b/release/freedesktop/icons/22x22/apps/blender.png
index cc79979d428..cc79979d428 100644
--- a/release/freedesktop/icons/22x22/blender.png
+++ b/release/freedesktop/icons/22x22/apps/blender.png
diff --git a/release/freedesktop/icons/24x24/blender.png b/release/freedesktop/icons/24x24/apps/blender.png
index 86e8248e786..86e8248e786 100644
--- a/release/freedesktop/icons/24x24/blender.png
+++ b/release/freedesktop/icons/24x24/apps/blender.png
diff --git a/release/freedesktop/icons/256x256/blender.png b/release/freedesktop/icons/256x256/apps/blender.png
index 117c25a5ab4..117c25a5ab4 100644
--- a/release/freedesktop/icons/256x256/blender.png
+++ b/release/freedesktop/icons/256x256/apps/blender.png
diff --git a/release/freedesktop/icons/32x32/blender.png b/release/freedesktop/icons/32x32/apps/blender.png
index 8af71e4f382..8af71e4f382 100644
--- a/release/freedesktop/icons/32x32/blender.png
+++ b/release/freedesktop/icons/32x32/apps/blender.png
diff --git a/release/freedesktop/icons/48x48/blender.png b/release/freedesktop/icons/48x48/apps/blender.png
index 9caed661fba..9caed661fba 100644
--- a/release/freedesktop/icons/48x48/blender.png
+++ b/release/freedesktop/icons/48x48/apps/blender.png
diff --git a/release/freedesktop/icons/scalable/blender.svg b/release/freedesktop/icons/scalable/apps/blender.svg
index bc1a3a970f6..bc1a3a970f6 100644
--- a/release/freedesktop/icons/scalable/blender.svg
+++ b/release/freedesktop/icons/scalable/apps/blender.svg
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 8bf28d272e9..92455e88246 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -253,7 +253,7 @@ if(UNIX AND NOT APPLE)
 		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,8 +290,20 @@ if(UNIX AND NOT APPLE)
 			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