summaryrefslogtreecommitdiff
path: root/navit
diff options
context:
space:
mode:
authormdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220>2015-01-07 13:30:21 +0000
committermdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220>2015-01-07 13:30:21 +0000
commit4dab8a81b127b8503ccd5015d9cd4a311fb172d9 (patch)
treee441b73021e8cab8c3af5e654f1e247092311ecf /navit
parent74cf49ec0ec52e089b57fc2975999b5dc75eac1d (diff)
downloadnavit-svn-4dab8a81b127b8503ccd5015d9cd4a311fb172d9.tar.gz
Add:core:Allow to disable generating png image without size specifier, as new graphics.c code no more requires it, and behaves better when all image files have size specifier.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5993 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit')
-rw-r--r--navit/xpm/CMakeLists.txt16
1 files changed, 9 insertions, 7 deletions
diff --git a/navit/xpm/CMakeLists.txt b/navit/xpm/CMakeLists.txt
index 6fb7ba9d..a2ce9e4b 100644
--- a/navit/xpm/CMakeLists.txt
+++ b/navit/xpm/CMakeLists.txt
@@ -54,13 +54,15 @@ macro(add_scale_targets IMAGE_SRC IMAGE_NAME)
else()
set (IMAGE_DST ${CMAKE_CURRENT_BINARY_DIR}/${IMAGE_NAME}_${CURRENT_SCALE}_${CURRENT_SCALE}.png)
endif()
-
- convert_to_png(
- ${CMAKE_CURRENT_SOURCE_DIR}/${IMAGE_SRC}
- ${IMAGE_DST}
- ${CURRENT_SCALE}
- )
- list(APPEND IMAGE_TARGETS ${IMAGE_DST})
+
+ if(NOT CURRENT_SCALE EQUAL -1)
+ convert_to_png(
+ ${CMAKE_CURRENT_SOURCE_DIR}/${IMAGE_SRC}
+ ${IMAGE_DST}
+ ${CURRENT_SCALE}
+ )
+ list(APPEND IMAGE_TARGETS ${IMAGE_DST})
+ endif()
endforeach()
endmacro()