summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authormartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-09-04 21:27:18 +0000
committermartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-09-04 21:27:18 +0000
commit08b9379c8bfb7ab0f4fa9ce652cc787d8de5f132 (patch)
treece2552df357a15a99736035d07e68ae9d4e16272 /CMakeLists.txt
parent168b540ca950049ed89a03ff2314a9612ad0ec73 (diff)
downloadnavit-svn-08b9379c8bfb7ab0f4fa9ce652cc787d8de5f132.tar.gz
Add:Build:Allow to use inkscape for svg to png conversion
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4756 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bbf4e6c5..bb433cff 100644
--- a/CMakeLists.txt
+++ b/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})