Fix:build:Copy SVG and XPM files to build directory, so they are available when runni...

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@5157 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/xpm/CMakeLists.txt b/navit/navit/xpm/CMakeLists.txt
index 037ed9f..816e1d3 100644 (file)
--- a/navit/navit/xpm/CMakeLists.txt
+++ b/navit/navit/xpm/CMakeLists.txt
@@ -73,7 +73,7 @@ if (USE_SVG OR SVG2PNG)
    FILE(GLOB SVG_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.svg" "*.svgz")
    
    if(USE_SVG)
-      list(APPEND IMAGE_TARGETS ${SVG_FILES})
+      list(APPEND IMAGES_TO_COPY ${SVG_FILES})
    endif(USE_SVG)
    if(SVG2PNG)
       list(APPEND FILES_TO_PNG ${SVG_FILES})
@@ -96,7 +96,7 @@ if(XPM2PNG)
       endif()
    endforeach()
 else()
-   list(APPEND IMAGE_TARGETS ${XPM_FILES})
+   list(APPEND IMAGES_TO_COPY ${XPM_FILES})
 endif(XPM2PNG)
 
 foreach (IMAGE_SRC ${FILES_TO_PNG})
@@ -116,6 +116,15 @@ foreach (IMAGE_SRC ${FILES_TO_PNG})
       
 endforeach()
 
+foreach (IMAGE_FILE ${IMAGES_TO_COPY})
+   add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${IMAGE_FILE}"
+                     DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${IMAGE_FILE}"
+                     COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/${IMAGE_FILE}"
+                     "${CMAKE_CURRENT_BINARY_DIR}/${IMAGE_FILE}"
+   )
+   list(APPEND IMAGE_TARGETS "${CMAKE_CURRENT_BINARY_DIR}/${IMAGE_FILE}")
+endforeach()
+
 add_custom_target(images ALL DEPENDS ${IMAGE_TARGETS})
 add_custom_target(images_resource COMMAND mkdir -p ../resources/share/navit/xpm COMMAND cp ${IMAGE_TARGETS} ../resources/share/navit/xpm)
 add_dependencies(images_resource images)