Don't link to indirect deps anymore, thanks to ewoerner for pointing that out

[quassel.git] / cmake / modules / QuasselMacros.cmake

diff --git a/cmake/modules/QuasselMacros.cmake b/cmake/modules/QuasselMacros.cmake
index d16dcd4..707afc9 100644 (file)
--- a/cmake/modules/QuasselMacros.cmake
+++ b/cmake/modules/QuasselMacros.cmake
@@ -9,14 +9,17 @@ 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(input ${CMAKE_SOURCE_DIR}/i18n/${basename}.ts)
   set(output ${CMAKE_CURRENT_BINARY_DIR}/${basename}.qm)
   add_custom_command(OUTPUT ${output}
           COMMAND ${QT_LRELEASE_EXECUTABLE}
@@ -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)