diff options
| author | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-04-03 21:10:14 +0000 |
|---|---|---|
| committer | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-04-03 21:10:14 +0000 |
| commit | 52dd5b9f39cb96d41e27fbefce7ac4fd233ab2a5 (patch) | |
| tree | 6a20e3f00d7eebd6f7dfd63a60c41b4dee17ec58 /navit/xpm | |
| parent | dcba7380a9ef016bdb5d23729dda87ff9e045b4c (diff) | |
| download | navit-52dd5b9f39cb96d41e27fbefce7ac4fd233ab2a5.tar.gz | |
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: http://svn.code.sf.net/p/navit/code/trunk/navit@5007 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/xpm')
| -rw-r--r-- | navit/xpm/CMakeLists.txt | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/navit/xpm/CMakeLists.txt b/navit/xpm/CMakeLists.txt index 36635570a..4d5899d00 100644 --- a/navit/xpm/CMakeLists.txt +++ b/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) |