Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Campbell Barton
2011-04-21 06:37:54 +00:00
parent 817c6eebe4
commit c3d1e1f3e9
8 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
release/freedesktop/icons/16x16/blender.png → release/freedesktop/icons/16x16/apps/blender.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 977 B

After

Width:  |  Height:  |  Size: 977 B

0
release/freedesktop/icons/22x22/blender.png → release/freedesktop/icons/22x22/apps/blender.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
release/freedesktop/icons/24x24/blender.png → release/freedesktop/icons/24x24/apps/blender.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
release/freedesktop/icons/256x256/blender.png → release/freedesktop/icons/256x256/apps/blender.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

0
release/freedesktop/icons/32x32/blender.png → release/freedesktop/icons/32x32/apps/blender.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

0
release/freedesktop/icons/48x48/blender.png → release/freedesktop/icons/48x48/apps/blender.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
release/freedesktop/icons/scalable/blender.svg → release/freedesktop/icons/scalable/apps/blender.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

18
source/creator/CMakeLists.txt
View 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