diff options
Diffstat (limited to 'navit/textures/CMakeLists.txt')
| -rw-r--r-- | navit/textures/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/navit/textures/CMakeLists.txt b/navit/textures/CMakeLists.txt index 5eb1fcf7e..b59a0a17f 100644 --- a/navit/textures/CMakeLists.txt +++ b/navit/textures/CMakeLists.txt @@ -30,7 +30,7 @@ macro(convert_to_png TEXTURE_INPUT TEXTURE_OUTPUT SCALE) else() set(SCALE_ARGS) endif() - set(COMMAND_ARGS --without-gui --export-background-opacity=0 --export-png ${TEXTURE_OUTPUT} ${SCALE_ARGS} ${TEXTURE_INPUT}) + set(COMMAND_ARGS --export-type=png --export-background-opacity=0 ${SCALE_ARGS} --export-filename=${TEXTURE_OUTPUT} ${TEXTURE_INPUT}) else() message(FATAL_ERROR "no svg2png converter defined here.") endif() @@ -110,6 +110,7 @@ foreach (TEXTURE_SRC ${FILES_TO_PNG}) endforeach() +if (NOT ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR} ) foreach (TEXTURE_FILE ${TEXTURES_TO_COPY}) add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${TEXTURE_FILE}" DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${TEXTURE_FILE}" @@ -118,6 +119,7 @@ foreach (TEXTURE_FILE ${TEXTURES_TO_COPY}) ) list(APPEND TEXTURE_TARGETS "${CMAKE_CURRENT_BINARY_DIR}/${TEXTURE_FILE}") endforeach() +endif() add_custom_target(textures ALL DEPENDS ${TEXTURE_TARGETS}) add_custom_target(textures_resource COMMAND mkdir -p ../resources/share/navit/textures COMMAND cp ${TEXTURE_TARGETS} ../resources/share/navit/textures) |