[Navit-cvs-commit] SF.net SVN: navit:[3930] trunk/navit/CMakeLists.txt

[<mar...@us...>]

Revision: 3930
          http://navit.svn.sourceforge.net/navit/?rev=3930&view=rev
Author:   martin-s
Date:     2011-01-17 22:58:41 +0000 (Mon, 17 Jan 2011)

Log Message:
-----------
Fix:Build:Only use convert as last possibility since it does worst conversion of svgs

Modified Paths:
--------------
    trunk/navit/CMakeLists.txt

Modified: trunk/navit/CMakeLists.txt
===================================================================
--- trunk/navit/CMakeLists.txt	2011-01-17 22:57:23 UTC (rev 3929)
+++ trunk/navit/CMakeLists.txt	2011-01-17 22:58:41 UTC (rev 3930)
@@ -356,11 +356,6 @@
 # Image conversion
 find_program(IMAGE_CONVERTER NAMES convert)
 execute_process(COMMAND ${IMAGE_CONVERTER} -list format OUTPUT_VARIABLE CONVERT_FORMATS)
-if(CONVERT_FORMATS MATCHES ".*SVGZ[ *][ ]*SVG[ ]*r[w-].*")
- message(STATUS ${IMAGE_CONVERTER})
-   set(IMAGE_CONVERTER_SVGZ ${IMAGE_CONVERTER})
-   set(IMAGE_CONVERTER_SVG ${IMAGE_CONVERTER})
-endif()
 if(CONVERT_FORMATS MATCHES ".*XPM[ *][ ]*XPM[ ]*r[w-].*")
    message(STATUS ${IMAGE_CONVERTER})
    set(IMAGE_CONVERTER_XPM ${IMAGE_CONVERTER})
@@ -368,9 +363,12 @@
 
 if (SVG2PNG)
    if (NOT IMAGE_CONVERTER_SVGZ)
-      set (SVG_CONVERTER_PROGS rsvg-convert ksvgtopng ksvgtopng4)
+      set (SVG_CONVERTER_PROGS rsvg-convert ksvgtopng ksvgtopng4 convert)
       find_program(IMAGE_CONVERTER_SVGZ NAMES ${SVG_CONVERTER_PROGS})
    endif(NOT IMAGE_CONVERTER_SVGZ)
+   if (NOT IMAGE_CONVERTER_SVG)
+      set(IMAGE_CONVERTER_SVG ${IMAGE_CONVERTER_SVGZ})
+   endif(NOT IMAGE_CONVERTER_SVG)
 
    message(STATUS "SVG2PNG-Converter: ${IMAGE_CONVERTER_SVGZ}")
    if (NOT IMAGE_CONVERTER_SVGZ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.