summaryrefslogtreecommitdiff
path: root/navit/maps
diff options
context:
space:
mode:
authorsleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220>2012-05-13 17:06:46 +0000
committersleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220>2012-05-13 17:06:46 +0000
commitb0bb3d844633cb1a7921064cfd83e99d52d4bf67 (patch)
tree0efa02424272988a9671773522672c6bfdaae3e0 /navit/maps
parentf86cf9fed245ebd428888783af0c0877e39029a5 (diff)
downloadnavit-b0bb3d844633cb1a7921064cfd83e99d52d4bf67.tar.gz
Fix:maps:Use VERBATIM in CMakeLists.txt for proper quoting
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5102 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/maps')
-rw-r--r--navit/maps/CMakeLists.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/navit/maps/CMakeLists.txt b/navit/maps/CMakeLists.txt
index c4c74dfaf..ffe3e1e7a 100644
--- a/navit/maps/CMakeLists.txt
+++ b/navit/maps/CMakeLists.txt
@@ -9,6 +9,7 @@ if(SAMPLE_MAP)
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
+ VERBATIM
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin
)
if(DOWNLOAD_SAMPLE_MAP)
@@ -18,12 +19,14 @@ if(SAMPLE_MAP)
-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
+ VERBATIM
)
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
+ | ${MAPTOOL_PATH} ${maptool_args} ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin
+ VERBATIM
DEPENDS maptool ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.osm.bz2
)
add_custom_command (
@@ -32,6 +35,7 @@ if(SAMPLE_MAP)
-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
+ VERBATIM
)
endif()
endif()