From 2fe35914e17d6173925be06c61974479666b9ef7 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 25 Apr 2018 09:24:54 +0200 Subject: 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. --- source/creator/CMakeLists.txt | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'source/creator/CMakeLists.txt') 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 -- cgit v1.2.3