diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-18 15:48:17 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-18 15:48:17 +0000 |
| commit | 0b55f321aec49e7867faa98f75a3d2028802d4eb (patch) | |
| tree | ffbee7b25d66d9274a5c8f4b2e353e32d6da7efe | |
| parent | f23f9bfb98f9791a1175bf03d7ec5a4406aa2ab9 (diff) | |
| download | navit-0b55f321aec49e7867faa98f75a3d2028802d4eb.tar.gz | |
Fix:Build:Better quoting
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3939 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | cmake/navit_writemapxml.cmake | 2 | ||||
| -rw-r--r-- | cmake/navit_writeto.cmake | 2 | ||||
| -rw-r--r-- | navit/maps/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmake/navit_writemapxml.cmake b/cmake/navit_writemapxml.cmake new file mode 100644 index 000000000..7ca58d268 --- /dev/null +++ b/cmake/navit_writemapxml.cmake @@ -0,0 +1,2 @@ +message("${TEXT}") +file(WRITE ${DST} "<map type=\"${TYPE}\" data=\"$NAVIT_SHAREDIR/maps/${DATA}\" />\n") diff --git a/cmake/navit_writeto.cmake b/cmake/navit_writeto.cmake deleted file mode 100644 index e8ac77158..000000000 --- a/cmake/navit_writeto.cmake +++ /dev/null @@ -1,2 +0,0 @@ -message("${TEXT}") -file(WRITE ${DST} "${TEXT}\n") diff --git a/navit/maps/CMakeLists.txt b/navit/maps/CMakeLists.txt index 212a36e2c..03c405a20 100644 --- a/navit/maps/CMakeLists.txt +++ b/navit/maps/CMakeLists.txt @@ -5,7 +5,7 @@ if(SAMPLE_MAP) GET_TARGET_PROPERTY(MAPTOOL_PATH maptool LOCATION) add_custom_command ( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.xml - COMMAND ${CMAKE_COMMAND} -D TEXT:STRING='<map data=\"$$NAVIT_SHAREDIR/maps/${SAMPLE_MAP_NAME}.bin\" type=\"binfile\"/>' -D DST=${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.xml -P ${PROJECT_SOURCE_DIR}/cmake/navit_writeto.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 ( |