Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-04-25 10:24:54 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-04-25 10:24:54 +0300
commit2fe35914e17d6173925be06c61974479666b9ef7 (patch)
tree418463b00ca4dcb2465329a8283fe85090a19c27 /source
parent4d6cdb8b897861679e94aa28e9b193255e2c3f5a (diff)
CMake: generate icon list for installation
MSVC users weren't getting icons installed, since glob isn't reliable, list all files in a section which the update script maintains.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/datafiles/CMakeLists.txt46
-rw-r--r--source/creator/CMakeLists.txt21
2 files changed, 64 insertions, 3 deletions
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index 65c55b6cd22..697fd5a0a4f 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -525,6 +525,52 @@ set(ICON_NAMES
imagefile
)
+# This section is maintained by the updating script, keep BEGIN/END comments.
+set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
+ # BEGIN ICON_GEOM_NAMES
+ ops.armature.extrude.cursor
+ ops.armature.extrude
+ ops.generic.cursor
+ ops.generic.select_border
+ ops.generic.select_circle
+ ops.generic.select_lasso
+ ops.gpencil.draw
+ ops.gpencil.draw.eraser
+ ops.gpencil.draw.line
+ ops.gpencil.draw.poly
+ ops.mesh.bisect
+ ops.mesh.inset
+ ops.mesh.knife_tool
+ ops.mesh.loopcut_slide
+ ops.mesh.offset_edge_loops_slide
+ ops.mesh.polybuild_hover
+ ops.mesh.rip
+ ops.mesh.rip_edge
+ ops.mesh.spin
+ ops.mesh.spin.duplicate
+ ops.mesh.vertices_smooth
+ ops.particle.brush_edit.add
+ ops.particle.brush_edit.comb
+ ops.particle.brush_edit.comb.weight
+ ops.particle.brush_edit.cut
+ ops.particle.brush_edit.length
+ ops.particle.brush_edit.puff
+ ops.particle.brush_edit.smooth
+ ops.transform.edge_slide
+ ops.transform.push_pull
+ ops.transform.resize.cage
+ ops.transform.resize
+ ops.transform.rotate
+ ops.transform.shrink_fatten
+ ops.transform.translate
+ ops.transform.vert_slide
+ ops.transform.vertex_random
+ ops.view3d.edit_mesh_extrude
+ ops.view3d.edit_mesh_extrude_individual
+ ops.view3d.ruler
+ # END ICON_GEOM_NAMES
+)
+
data_to_c_simple(../../../../release/datafiles/bfont.pfb SRC)
data_to_c_simple(../../../../release/datafiles/bfont.ttf SRC)
data_to_c_simple(../../../../release/datafiles/bmonofont.ttf SRC)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 5ed9355105a..585a2f58204 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -958,13 +958,28 @@ delayed_do_install(${TARGETDIR_VER})
unset(BLENDER_TEXT_FILES)
unset(BLENDER_TEXT_FILES_DESTINATION)
+
+# -----------------------------------------------------------------------------
+# Geometry Icons
+
# Geometry icons.
+get_property(_icon_names GLOBAL PROPERTY ICON_GEOM_NAMES)
+set(_icon_files)
+foreach(_f ${_icon_names})
+ list(APPEND _icon_files
+ "${CMAKE_SOURCE_DIR}/release/datafiles/icons/${_f}.dat"
+ )
+endforeach()
install(
- DIRECTORY
- ${CMAKE_SOURCE_DIR}/release/datafiles/icons
- DESTINATION ${TARGETDIR_VER}/datafiles
+ FILES ${_icon_files}
+ DESTINATION ${TARGETDIR_VER}/datafiles/icons
)
+unset(_icon_names)
+unset(_icon_files)
+unset(_f)
+
+
# -----------------------------------------------------------------------------
# Setup link libs