diff options
author | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-04-23 18:46:45 +0000 |
---|---|---|
committer | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-04-23 18:46:45 +0000 |
commit | ce643147562bb183284e7a60a6129a6da9b80ee5 (patch) | |
tree | 38a66a22576177e1bc9ba7d60b42d731fbefd7fe /navit/maps | |
parent | 512ae43cf215413022babfe541f0a0b0626176ba (diff) | |
download | navit-ce643147562bb183284e7a60a6129a6da9b80ee5.tar.gz |
Fix:build/cmake:Don't download map on every build, when crosscompiling
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5038 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/maps')
-rw-r--r-- | navit/maps/CMakeLists.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/navit/maps/CMakeLists.txt b/navit/maps/CMakeLists.txt index 045cd409e..a0f37069f 100644 --- a/navit/maps/CMakeLists.txt +++ b/navit/maps/CMakeLists.txt @@ -13,8 +13,8 @@ if(SAMPLE_MAP) 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_target ( - ${SAMPLE_MAP_NAME}.bin + 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 ) else() @@ -25,7 +25,6 @@ if(SAMPLE_MAP) ) endif() add_custom_target(sample_map ALL DEPENDS ${SAMPLE_MAP_NAME}.xml) - add_dependencies(sample_map ${SAMPLE_MAP_NAME}.bin) if(NOT CMAKE_CROSSCOMPILING AND BZCAT) add_dependencies(sample_map ${SAMPLE_MAP_NAME}.osm.bz2) endif() |