cmake - install icons into $PREFIX/share/icons/hicolor/ rather then $PREFIX/share...
authorCampbell Barton <ideasman42@gmail.com>
Thu, 21 Apr 2011 06:37:54 +0000 (06:37 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 21 Apr 2011 06:37:54 +0000 (06:37 +0000)
release/freedesktop/icons/16x16/apps/blender.png [moved from release/freedesktop/icons/16x16/blender.png with 100% similarity]
release/freedesktop/icons/22x22/apps/blender.png [moved from release/freedesktop/icons/22x22/blender.png with 100% similarity]
release/freedesktop/icons/24x24/apps/blender.png [moved from release/freedesktop/icons/24x24/blender.png with 100% similarity]
release/freedesktop/icons/256x256/apps/blender.png [moved from release/freedesktop/icons/256x256/blender.png with 100% similarity]
release/freedesktop/icons/32x32/apps/blender.png [moved from release/freedesktop/icons/32x32/blender.png with 100% similarity]
release/freedesktop/icons/48x48/apps/blender.png [moved from release/freedesktop/icons/48x48/blender.png with 100% similarity]
release/freedesktop/icons/scalable/apps/blender.svg [moved from release/freedesktop/icons/scalable/blender.svg with 100% similarity]
source/creator/CMakeLists.txt

index 8bf28d272e90a95a9c2299d12303393f5e526bcc..92455e88246d0d7e63b4e918ed1a042d2a206618 100644 (file)
@@ -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