kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix cmake Inkscape auto generate of SVG on OS X giving an error popup, the binary

Browse Source 
that is found by find_program is a shim that doesn't take command line arguments.
This commit is contained in:
Brecht Van Lommel 2013-08-26 14:13:04 +00:00
parent 49ae48bc16
commit 11cfc97e29
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build_files/cmake/macros.cmake
View File

@ -819,6 +819,15 @@ macro(svg_to_png
mark_as_advanced(INKSCAPE_EXE) mark_as_advanced(INKSCAPE_EXE)
if(INKSCAPE_EXE) if(INKSCAPE_EXE)
if(APPLE)
# in OS X app bundle, the binary is a shim that doesn't take any
# command line arguments, replace it with the actual binary
string(REPLACE "MacOS/Inkscape" "Resources/bin/inkscape" INKSCAPE_REAL_EXE ${INKSCAPE_EXE})
if(EXISTS "${INKSCAPE_REAL_EXE}")
set(INKSCAPE_EXE ${INKSCAPE_REAL_EXE})
endif()
endif()
add_custom_command( add_custom_command(
OUTPUT ${_file_to} OUTPUT ${_file_to}
COMMAND ${INKSCAPE_EXE} ${_file_from} --export-dpi=${dpi} --without-gui --export-png=${_file_to} COMMAND ${INKSCAPE_EXE} ${_file_from} --export-dpi=${dpi} --without-gui --export-png=${_file_to}
@ -831,4 +840,4 @@ macro(svg_to_png
unset(_file_from) unset(_file_from)
unset(_file_to) unset(_file_to)
endmacro() endmacro()