CMakeLists.txt (navit-0.5.5) | : | CMakeLists.txt (navit-0.5.6) | ||
---|---|---|---|---|
skipping to change at line 33 | skipping to change at line 33 | |||
string(REGEX MATCH "width=\"([0-9]*)[pxt]*\"" NEW_SCALE_L INE ${NEW_SCALE_LINE}) | string(REGEX MATCH "width=\"([0-9]*)[pxt]*\"" NEW_SCALE_L INE ${NEW_SCALE_LINE}) | |||
set(NEW_SCALE ${CMAKE_MATCH_1}) | set(NEW_SCALE ${CMAKE_MATCH_1}) | |||
endif() | endif() | |||
set(COMMAND_ARGS ${NEW_SCALE} ${NEW_SCALE} ${IMAGE_INPUT} ${IMAG E_OUTPUT}) | set(COMMAND_ARGS ${NEW_SCALE} ${NEW_SCALE} ${IMAGE_INPUT} ${IMAG E_OUTPUT}) | |||
elseif(${IMAGE_CONVERTER_${FILE_TYPE}} MATCHES "inkscape") | elseif(${IMAGE_CONVERTER_${FILE_TYPE}} MATCHES "inkscape") | |||
if (${SCALE} GREATER 0) | if (${SCALE} GREATER 0) | |||
set(SCALE_ARGS --export-width=${SCALE} --export-height=${ SCALE}) | set(SCALE_ARGS --export-width=${SCALE} --export-height=${ SCALE}) | |||
else() | else() | |||
set(SCALE_ARGS) | set(SCALE_ARGS) | |||
endif() | endif() | |||
set(COMMAND_ARGS --without-gui --export-background-opacity=0 --ex port-png ${IMAGE_OUTPUT} ${SCALE_ARGS} ${IMAGE_INPUT}) | set(COMMAND_ARGS --export-type=png --export-background-opacity=0 ${SCALE_ARGS} --export-filename=${IMAGE_OUTPUT} ${IMAGE_INPUT}) | |||
else() | else() | |||
message(FATAL_ERROR "no svg2png converter defined here.") | message(FATAL_ERROR "no svg2png converter defined here.") | |||
endif() | endif() | |||
add_custom_command ( | add_custom_command ( | |||
OUTPUT ${IMAGE_OUTPUT} | OUTPUT ${IMAGE_OUTPUT} | |||
DEPENDS ${IMAGE_INPUT} | DEPENDS ${IMAGE_INPUT} | |||
COMMAND ${IMAGE_CONVERTER_${FILE_TYPE}} ${COMMAND_ARGS} | COMMAND ${IMAGE_CONVERTER_${FILE_TYPE}} ${COMMAND_ARGS} | |||
) | ) | |||
endmacro() | endmacro() | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added |