From f5a3f3f7c6709310e9570f42bef913655a9e84d3 Mon Sep 17 00:00:00 2001
From: mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Tue, 3 Apr 2012 21:10:14 +0000
Subject: [PATCH] Fix:core:Fix cmake png images generation when both xpm and
 svg sources of the same picture exist. Fix nightly Android builds. |Thanks
 themroc

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@5007 ffa7fe5e-494d-0410-b361-a75ebd5db220
---
 navit/navit/xpm/CMakeLists.txt | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/navit/navit/xpm/CMakeLists.txt b/navit/navit/xpm/CMakeLists.txt
index 3663557..4d5899d 100644
--- a/navit/navit/xpm/CMakeLists.txt
+++ b/navit/navit/xpm/CMakeLists.txt
@@ -77,7 +77,17 @@ endif()
 
 FILE(GLOB XPM_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.xpm")
 if(XPM2PNG)
-   list(APPEND FILES_TO_PNG ${XPM_FILES})
+   foreach (IMAGE_SRC ${SVG_FILES})
+      string(REGEX REPLACE ".[a-z]*\$" "" IMAGE ${IMAGE_SRC})
+      list(APPEND SVG_LIST ${IMAGE})
+   endforeach()
+   foreach (IMAGE_SRC ${XPM_FILES})
+      string(REGEX REPLACE ".[a-z]*\$" "" IMAGE ${IMAGE_SRC})
+      list(FIND SVG_LIST ${IMAGE} DUP_IMG)
+      if ( ${DUP_IMG} LESS 0 )
+         list(APPEND FILES_TO_PNG ${IMAGE_SRC})
+      endif()
+   endforeach()
 else()
    list(APPEND IMAGE_TARGETS ${XPM_FILES})
 endif(XPM2PNG)
-- 
2.7.4