X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=cmake%2Fmodules%2FQuasselMacros.cmake;h=8e453e26370a3486375dce0e233b3a9823c152e5;hp=5657c8a18cee0973cb388d300e55532ef5c7e3ae;hb=f8de7b607c3e168996138cbc5e1cfca18254ba09;hpb=ad79428b72613730f61b0b3fdb18afa21eee3cc7

diff --git a/cmake/modules/QuasselMacros.cmake b/cmake/modules/QuasselMacros.cmake
index 5657c8a1..8e453e26 100644
--- a/cmake/modules/QuasselMacros.cmake
+++ b/cmake/modules/QuasselMacros.cmake
@@ -17,15 +17,31 @@ macro(setup_qt4_variables)
   set(QUASSEL_QT_LIBRARIES ${QUASSEL_QT_LIBRARIES} ${QT_LIBRARIES})
 endmacro(setup_qt4_variables)
 
-# This generates a .qm from a .po file
-macro(generate_qm outvar basename)
-  set(input ${CMAKE_SOURCE_DIR}/i18n/${basename}.po)
-  set(output ${CMAKE_BINARY_DIR}/i18n/${basename}.qm)
+# This generates a .ts from a .po file
+macro(generate_ts outvar basename)
+  set(input ${CMAKE_SOURCE_DIR}/po/${basename}.po)
+  set(output ${CMAKE_BINARY_DIR}/po/${basename}.ts)
   add_custom_command(OUTPUT ${output}
           COMMAND ${QT_LCONVERT_EXECUTABLE}
           ARGS -i ${input}
-               -of qm
+               -of ts
                -o ${output}
+# This is a workaround to add (duplicate) strings that lconvert missed to the .ts
+          COMMAND ${QT_LUPDATE_EXECUTABLE}
+          ARGS -silent
+	       ${CMAKE_SOURCE_DIR}/src/
+               -ts ${output}
           DEPENDS ${basename}.po)
   set(${outvar} ${output})
+endmacro(generate_ts outvar basename)
+
+# This generates a .qm from a .ts file
+macro(generate_qm outvar basename)
+  set(input ${CMAKE_BINARY_DIR}/po/${basename}.ts)
+  set(output ${CMAKE_BINARY_DIR}/po/${basename}.qm)
+  add_custom_command(OUTPUT ${output}
+          COMMAND ${QT_LRELEASE_EXECUTABLE}
+          ARGS ${input}
+          DEPENDS ${basename}.ts)
+  set(${outvar} ${output})
 endmacro(generate_qm outvar basename)