diff options
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | navit/xpm/CMakeLists.txt | 20 |
2 files changed, 19 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d5eec66a2..32679392e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -188,9 +188,15 @@ set(USE_PLUGINS TRUE) set(USE_ROUTING TRUE) set(USE_SVG TRUE) set(SVG2PNG TRUE) -set(svg2png_scaling 32 48 96) -set(svg2png_scaling_flag 32 48 96) -set(svg2png_scaling_nav 32 48 96) +IF(NOT svg2png_scaling) + set(svg2png_scaling 32 48 96) +ENDIF() +IF(NOT svg2png_scaling_flag) + set(svg2png_scaling_flag 32 48 96) +ENDIF() +IF(NOT svg2png_scaling_nav) + set(svg2png_scaling_nav 32 48 96) +ENDIF() set(DBUS_USE_SYSTEM_BUS FALSE) set(BUILD_MAPTOOL TRUE) diff --git a/navit/xpm/CMakeLists.txt b/navit/xpm/CMakeLists.txt index edd6e007b..7f40445f2 100644 --- a/navit/xpm/CMakeLists.txt +++ b/navit/xpm/CMakeLists.txt @@ -25,7 +25,8 @@ macro(convert_svg2png IMAGE_INPUT IMAGE_OUTPUT SCALE) endmacro() macro(add_scale_targets IMAGE_NAME) - foreach (CURRENT_SCALE ${ARGN}) + string(REPLACE "," ";" SCALES ${ARGN}) + foreach (CURRENT_SCALE ${SCALES}) convert_svg2png( ${CMAKE_CURRENT_SOURCE_DIR}/${SVG} ${CMAKE_CURRENT_BINARY_DIR}/${IMAGE_NAME}_${CURRENT_SCALE}_${CURRENT_SCALE}.png @@ -44,7 +45,7 @@ FILE(GLOB XPM_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.xpm") list(APPEND IMAGE_TARGETS ${XPM_FILES}) if (USE_SVG OR SVG2PNG) - FILE(GLOB SVG_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.svg") + FILE(GLOB SVG_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.svg" "*.svgz") if(USE_SVG) list(APPEND IMAGE_TARGETS ${SVG_FILES}) @@ -52,7 +53,7 @@ if (USE_SVG OR SVG2PNG) if (SVG2PNG) foreach (SVG ${SVG_FILES}) - string(REPLACE ".svg" "" IMAGE ${SVG}) + string(REGEX REPLACE ".svgz*\$" "" IMAGE ${SVG}) if ( DEFINED svg2png_scaling_nav AND ${IMAGE} MATCHES "^nav_") add_scale_targets(${IMAGE} ${svg2png_scaling_nav}) @@ -60,14 +61,13 @@ if (USE_SVG OR SVG2PNG) add_scale_targets(${IMAGE} ${svg2png_scaling_flag}) elseif( DEFINED svg2png_scaling) add_scale_targets(${IMAGE} ${svg2png_scaling}) + convert_svg2png ( + "${CMAKE_CURRENT_SOURCE_DIR}/${SVG}" + "${CMAKE_CURRENT_BINARY_DIR}/${IMAGE}.png" + 0 + ) + list(APPEND IMAGE_TARGETS "${CMAKE_CURRENT_BINARY_DIR}/${IMAGE}.png") endif() - - convert_svg2png ( - "${CMAKE_CURRENT_SOURCE_DIR}/${SVG}" - "${CMAKE_CURRENT_BINARY_DIR}/${IMAGE}.png" - 0 - ) - list(APPEND IMAGE_TARGETS "${CMAKE_CURRENT_BINARY_DIR}/${IMAGE}.png") endforeach() endif(SVG2PNG) endif(USE_SVG OR SVG2PNG) |