Add:Build:Allow to use inkscape for svg to png conversion

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4756 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt
index bbf4e6c..bb433cf 100644 (file)
--- a/navit/CMakeLists.txt
+++ b/navit/CMakeLists.txt
@@ -1,4 +1,5 @@
-set(MACOSX_BUNDLE_GUI_IDENTIFIER "Navit")
+set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.navitproject.navit")
+set(MACOSX_BUNDLE_BUNDLE_NAME "Navit")
 project(navit C)
 
 if(DEFINED CMAKE_CXX_COMPILER AND CMAKE_CXX_COMPILER MATCHES "^$")
@@ -502,10 +503,12 @@ if(CONVERT_FORMATS MATCHES ".*XPM[ *][ ]*XPM[ ]*r[w-].*")
    set(IMAGE_CONVERTER_XPM ${IMAGE_CONVERTER})
 endif()
 
+set(CMAKE_APPBUNDLE_PATH "")
 if (SVG2PNG)
    if (NOT IMAGE_CONVERTER_SVGZ)
-      set (SVG_CONVERTER_PROGS rsvg-convert ksvgtopng ksvgtopng4)
-      find_program(IMAGE_CONVERTER_SVGZ NAMES ${SVG_CONVERTER_PROGS})
+      set (SVG_CONVERTER_PROGS rsvg-convert ksvgtopng ksvgtopng4 inkscape)
+      set (CMAKE_FIND_APPBUNDLE "NEVER")
+      find_program(IMAGE_CONVERTER_SVGZ NAMES ${SVG_CONVERTER_PROGS} PATHS /Applications/Inkscape.app/Contents/Resources/bin)
       if (NOT IMAGE_CONVERTER_SVGZ)
          if(CONVERT_FORMATS MATCHES ".*[ ]*SVG[ ]*r[w-].*")
             set(IMAGE_CONVERTER_SVGZ ${IMAGE_CONVERTER})

diff --git a/navit/navit/xpm/CMakeLists.txt b/navit/navit/xpm/CMakeLists.txt
index d30ad29..8ddb671 100644 (file)
--- a/navit/navit/xpm/CMakeLists.txt
+++ b/navit/navit/xpm/CMakeLists.txt
@@ -23,6 +23,13 @@ macro(convert_to_png IMAGE_INPUT IMAGE_OUTPUT SCALE)
          string(REGEX REPLACE ".*width=\"([0-9]*).*" "\\1" NEW_SCALE ${NEW_SCALE_LINE})
        endif()
       set(COMMAND_ARGS ${NEW_SCALE} ${NEW_SCALE}  ${IMAGE_INPUT} --output ${IMAGE_OUTPUT})
+   elseif(${IMAGE_CONVERTER_${FILE_TYPE}} MATCHES "inkscape")
+      if (${SCALE} GREATER 0)
+         set(SCALE_ARGS --export-width=${SCALE} --export-height=${SCALE})
+      else()
+         set(SCALE_ARGS)
+      endif()
+      set(COMMAND_ARGS --without-gui --export-background-opacity=0 --export-png ${IMAGE_OUTPUT} ${SCALE_ARGS} ${IMAGE_INPUT})
    else()
       message(FATAL_ERROR "no svg2png converter defined here.")
    endif()
@@ -93,6 +100,7 @@ foreach (IMAGE_SRC ${FILES_TO_PNG})
 endforeach()
 
 add_custom_target(images ALL DEPENDS ${IMAGE_TARGETS})
+add_custom_command(TARGET images COMMAND mkdir -p ../resources/share/navit/xpm COMMAND cp ${IMAGE_TARGETS} ../resources/share/navit/xpm)
 
 install(
    FILES ${IMAGE_TARGETS}