diff options
| author | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-09-12 18:57:43 +0000 |
|---|---|---|
| committer | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-09-12 18:57:43 +0000 |
| commit | cbc3bb5f6d9dfa6782a4f865bb8264f8c1d70718 (patch) | |
| tree | d9d57d12245207f9805b0ea7dd3061cb962d8d0f /navit/CMakeLists.txt | |
| parent | df4c7d30efa541841cca44c3f11951c215717476 (diff) | |
| download | navit-svn-cbc3bb5f6d9dfa6782a4f865bb8264f8c1d70718.tar.gz | |
Fix:build/cmake:Fixed setting of medium sized icons
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4779 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/CMakeLists.txt')
| -rw-r--r-- | navit/CMakeLists.txt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt index d00373fb..a5cb572f 100644 --- a/navit/CMakeLists.txt +++ b/navit/CMakeLists.txt @@ -112,7 +112,8 @@ ADD_CUSTOM_TARGET( -P ${PROJECT_SOURCE_DIR}/cmake/version.cmake ) -macro(process_xslt SRC_XML DEST_XML XSL_OPTIONS) +# additional parameter are passed to the stylesheet processor as parameter +macro(process_xslt SRC_XML DEST_XML) set(XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E copy ${SRC_XML} ${DEST_XML} COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/navit/navit.dtd ${CMAKE_CURRENT_BINARY_DIR}/navit.dtd) if(XSL_PROCESSING AND XSLTS) @@ -121,11 +122,11 @@ macro(process_xslt SRC_XML DEST_XML XSL_OPTIONS) set (XSLT_FILE "${PROJECT_SOURCE_DIR}/navit/xslt/${tmp}.xslt") list(APPEND XSLT_FILES "${XSLT_FILE}") list(APPEND XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E echo Applying ${tmp}.xslt) - if(${XSLT_PROCESSOR} MATCHES "xsltproc") + if(${XSLT_PROCESSOR} MATCHES "xsltproc") list(APPEND XSLT_COMMANDS COMMAND ${XSLT_PROCESSOR} ${XSLT_PROCESSOR_OPTIONS} ${XSLT_FILE} ${DEST_XML} > ${DEST_XML}.tmp) else() - list(APPEND XSLT_COMMANDS COMMAND ${XSLT_PROCESSOR} ${XSLT_PROCESSOR_OPTIONS} ${DEST_XML} ${XSLT_FILE} ${XSL_OPTIONS} > ${DEST_XML}.tmp) - endif() + list(APPEND XSLT_COMMANDS COMMAND ${XSLT_PROCESSOR} ${XSLT_PROCESSOR_OPTIONS} ${DEST_XML} ${XSLT_FILE} ${ARGN} > ${DEST_XML}.tmp) + endif() list(APPEND XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E rename ${DEST_XML}.tmp ${DEST_XML}) endforeach() endif() @@ -137,9 +138,9 @@ macro(process_xslt SRC_XML DEST_XML XSL_OPTIONS) endmacro() if(ANDROID) - process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml ${CMAKE_CURRENT_BINARY_DIR}/navithdpi.xml OSD_SIZE=2) + process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml ${CMAKE_CURRENT_BINARY_DIR}/navithdpi.xml OSD_SIZE=2 ICON_MEDIUM=48) process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml ${CMAKE_CURRENT_BINARY_DIR}/navitmdpi.xml OSD_SIZE=1.33) - process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml ${CMAKE_CURRENT_BINARY_DIR}/navitldpi.xml OSD_SIZE=1 ICON_MEDIUM=48) + process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml ${CMAKE_CURRENT_BINARY_DIR}/navitldpi.xml OSD_SIZE=1) add_custom_target( navit_config_xml ALL DEPENDS navithdpi.xml navitmdpi.xml navitldpi.xml) else() process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml ${CMAKE_CURRENT_BINARY_DIR}/navit.xml "") |