Fix:maps:CMake refactoring (wrap lines, more logical order)

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

diff --git a/navit/navit/maps/CMakeLists.txt b/navit/navit/maps/CMakeLists.txt
index 3258f98..c4c74df 100644 (file)
--- a/navit/navit/maps/CMakeLists.txt
+++ b/navit/navit/maps/CMakeLists.txt
@@ -3,26 +3,35 @@ if(SAMPLE_MAP)
    set(maptool_args "--attr-debug-level=5")
 
    GET_TARGET_PROPERTY(MAPTOOL_PATH maptool LOCATION)
+   add_custom_target(sample_map ALL DEPENDS ${SAMPLE_MAP_NAME}.xml)
    add_custom_command (
       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.xml
-      COMMAND ${CMAKE_COMMAND} -D TYPE=binfile -D DATA=${SAMPLE_MAP_NAME}.bin -D DST=${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.xml -P ${PROJECT_SOURCE_DIR}/cmake/navit_writemapxml.cmake
+      COMMAND ${CMAKE_COMMAND} -D TYPE=binfile -D DATA=${SAMPLE_MAP_NAME}.bin
+         -D DST=${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.xml
+        -P ${PROJECT_SOURCE_DIR}/cmake/navit_writemapxml.cmake
       DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin
    )
-   add_custom_command (
-      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.osm.bz2
-      COMMAND ${CMAKE_COMMAND} -D URL=http://www.navit-project.org/maps/${SAMPLE_MAP_NAME}.osm.bz2 -D DST=${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.osm.bz2 -P ${PROJECT_SOURCE_DIR}/cmake/navit_download.cmake
-   )
    if(DOWNLOAD_SAMPLE_MAP)
       add_custom_command (
          OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin
-         COMMAND ${CMAKE_COMMAND} -D URL=http://www.navit-project.org/maps/${SAMPLE_MAP_NAME}.bin -D DST=${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin -P ${PROJECT_SOURCE_DIR}/cmake/navit_download.cmake
+         COMMAND ${CMAKE_COMMAND}
+           -D URL=http://www.navit-project.org/maps/${SAMPLE_MAP_NAME}.bin
+           -D DST=${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin
+           -P ${PROJECT_SOURCE_DIR}/cmake/navit_download.cmake
       )
    else()
       add_custom_command (
          OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin
-         COMMAND bzcat ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.osm.bz2 | \"${MAPTOOL_PATH}\" ${maptool_args} ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin
+         COMMAND bzcat ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.osm.bz2
+           | \"${MAPTOOL_PATH}\" ${maptool_args} ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin
          DEPENDS maptool ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.osm.bz2
       )
+      add_custom_command (
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.osm.bz2
+        COMMAND ${CMAKE_COMMAND}
+           -D URL=http://www.navit-project.org/maps/${SAMPLE_MAP_NAME}.osm.bz2
+           -D DST=${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.osm.bz2
+           -P ${PROJECT_SOURCE_DIR}/cmake/navit_download.cmake
+      )
    endif()
-   add_custom_target(sample_map ALL DEPENDS ${SAMPLE_MAP_NAME}.xml)
 endif()