X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=cmake%2Fmodules%2FQuasselMacros.cmake;h=9d8c1cdd224d9f1d3c0b8cfc8a51a6926f416440;hp=d16dcd427fe1e9e44968d470b89b24ff23bd1c4d;hb=6b31f4c8abb36ebe658c2e5ce2a8e9ba2a50f443;hpb=392367381225027246e8c765a7c3b7e5bf186ee2

diff --git a/cmake/modules/QuasselMacros.cmake b/cmake/modules/QuasselMacros.cmake
index d16dcd42..9d8c1cdd 100644
--- a/cmake/modules/QuasselMacros.cmake
+++ b/cmake/modules/QuasselMacros.cmake
@@ -9,15 +9,18 @@ macro(setup_qt4_variables)
     set(MAIN MAIN)
   ENDIF(WIN32)
   foreach(qtmod CORE ${ARGV} ${MAIN})
-    set(QUASSEL_QT_LIBRARIES ${QUASSEL_QT_LIBRARIES} ${QT_QT${qtmod}_LIBRARY} ${QT_${qtmod}_LIB_DEPENDENCIES})
+    set(QUASSEL_QT_LIBRARIES ${QUASSEL_QT_LIBRARIES} ${QT_QT${qtmod}_LIBRARY})
+    if(STATIC)
+      set(QUASSEL_QT_LIBRARIES ${QUASSEL_QT_LIBRARIES} ${QT_${qtmod}_LIB_DEPENDENCIES})
+    endif(STATIC)
   endforeach(qtmod ${ARGV})
   set(QUASSEL_QT_LIBRARIES ${QUASSEL_QT_LIBRARIES} ${QT_LIBRARIES})
 endmacro(setup_qt4_variables)
 
 # This generates a .qm from a .ts file
 macro(generate_qm outvar basename)
-  set(input ${basename}.ts)
-  set(output ${CMAKE_CURRENT_BINARY_DIR}/${basename}.qm)
+  set(input ${CMAKE_SOURCE_DIR}/i18n/${basename}.ts)
+  set(output ${CMAKE_BINARY_DIR}/i18n/${basename}.qm)
   add_custom_command(OUTPUT ${output}
           COMMAND ${QT_LRELEASE_EXECUTABLE}
           ARGS ${input}
@@ -25,4 +28,4 @@ macro(generate_qm outvar basename)
                -silent -compress
           DEPENDS ${basename}.ts)
   set(${outvar} ${output})
-endmacro(generate_qm outvar basename)
\ No newline at end of file
+endmacro(generate_qm outvar basename)