diff options
| author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-05-12 19:51:29 +0000 |
|---|---|---|
| committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-05-12 19:51:29 +0000 |
| commit | 361c25f8cd482228adec560cff278ee89d0db231 (patch) | |
| tree | b3d5711b334b5c7ca1c8531db5bcec61c91ef29c /navit/maps | |
| parent | 21ab147057325ccc039f085b9df4ab4b331c7eef (diff) | |
| download | navit-361c25f8cd482228adec560cff278ee89d0db231.tar.gz | |
Fix:maps:CMake refactoring (wrap lines, more logical order)
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5100 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/maps')
| -rw-r--r-- | navit/maps/CMakeLists.txt | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/navit/maps/CMakeLists.txt b/navit/maps/CMakeLists.txt index 3258f98a3..c4c74dfaf 100644 --- a/navit/maps/CMakeLists.txt +++ b/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() |