Revision: 59382 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59382 Author: mont29 Date: 2013-08-22 13:51:00 +0000 (Thu, 22 Aug 2013) Log Message: ----------- Automatically re-generate png icon files from svg ones (CMake only for now)... Expects Inkscape program.
Modified Paths: -------------- trunk/blender/build_files/cmake/macros.cmake trunk/blender/source/blender/editors/datafiles/CMakeLists.txt Modified: trunk/blender/build_files/cmake/macros.cmake =================================================================== --- trunk/blender/build_files/cmake/macros.cmake 2013-08-22 13:48:22 UTC (rev 59381) +++ trunk/blender/build_files/cmake/macros.cmake 2013-08-22 13:51:00 UTC (rev 59382) @@ -799,4 +799,35 @@ unset(_file_from) unset(_file_to) unset(_file_to_path) + endmacro() + +macro(svg_to_png + file_from + file_to + dpi + list_to_add) + + # remove ../'s + get_filename_component(_file_from ${CMAKE_CURRENT_SOURCE_DIR}/${file_from} REALPATH) + get_filename_component(_file_to ${CMAKE_CURRENT_SOURCE_DIR}/${file_to} REALPATH) + + list(APPEND ${list_to_add} ${_file_to}) + + find_program(INKSCAPE_EXE inkscape) + mark_as_advanced(INKSCAPE_EXE) + + if(INKSCAPE_EXE) + add_custom_command( + OUTPUT ${_file_to} + COMMAND ${INKSCAPE_EXE} ${_file_from} --export-dpi=${dpi} --without-gui --export-png=${_file_to} + DEPENDS ${_file_from} ${INKSCAPE_EXE} + ) + else() + message(WARNING "Inkscape not found, could not re-generate ${_file_to} from ${_file_from}!") + endif() + + unset(_file_from) + unset(_file_to) + +endmacro() \ No newline at end of file Modified: trunk/blender/source/blender/editors/datafiles/CMakeLists.txt =================================================================== --- trunk/blender/source/blender/editors/datafiles/CMakeLists.txt 2013-08-22 13:48:22 UTC (rev 59381) +++ trunk/blender/source/blender/editors/datafiles/CMakeLists.txt 2013-08-22 13:51:00 UTC (rev 59382) @@ -47,8 +47,17 @@ # images data_to_c_simple(../../../../release/datafiles/splash.png SRC) + svg_to_png(../../../../release/datafiles/blender_icons.svg + ../../../../release/datafiles/blender_icons16.png + 90 SRC) data_to_c_simple(../../../../release/datafiles/blender_icons16.png SRC) + svg_to_png(../../../../release/datafiles/blender_icons.svg + ../../../../release/datafiles/blender_icons32.png + 180 SRC) data_to_c_simple(../../../../release/datafiles/blender_icons32.png SRC) + svg_to_png(../../../../release/datafiles/prvicons.svg + ../../../../release/datafiles/prvicons.png + 90 SRC) data_to_c_simple(../../../../release/datafiles/prvicons.png SRC) # brushes _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs