Changeset 2872 for vidalia/trunk/cmake

Timestamp:

07/13/08 05:03:05 (4 months ago)

Author:

edmanm

Message:

Add an argument to the vidalia_add_nsh() macro that accepts an output charset
and passes it to po2nsh.

Files:

• vidalia/trunk/cmake/VidaliaMacros.cmake (modified) (2 diffs)

vidalia/trunk/cmake/VidaliaMacros.cmake

@@ -106 +106 @@
 ## specified by NSIS_LANGUAGE. The absolute path to the .nsh file will be
 ## added to OUTFILES.
-macro(VIDALIA_ADD_NSH OUTFILES PO NSIS_LANGUAGE)
+macro(VIDALIA_ADD_NSH OUTFILES PO NSIS_LANGUAGE CHARSET)
   get_filename_component(po ${PO} ABSOLUTE)
   get_filename_component(outfile ${PO} NAME_WE)
@@ -114 +114 @@
   add_custom_command(OUTPUT ${nsh}
     COMMAND ${VIDALIA_PO2NSH_EXECUTABLE}
-    ARGS -q -i ${po} -o ${nsh} -l ${NSIS_LANGUAGE}
+    ARGS -q -i ${po} -f utf-8 -o ${nsh} -t ${CHARSET} -l ${NSIS_LANGUAGE}
     MAIN_DEPENDENCY ${po}
     DEPENDS ${VIDALIA_PO2NSH_EXECUTABLE}