From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Mon, 29 Sep 2008 12:46:17 +0000 (+0200)
Subject: Don't link to indirect deps anymore, thanks to ewoerner for pointing that out
X-Git-Tag: 0.3.1~220
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=5b1e88d1770922fbe8b166994b0f06aa7f596517

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

diff --git a/cmake/modules/QuasselMacros.cmake b/cmake/modules/QuasselMacros.cmake
index 1f4d2fdf..707afc9d 100644
--- a/cmake/modules/QuasselMacros.cmake
+++ b/cmake/modules/QuasselMacros.cmake
@@ -9,7 +9,10 @@ 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)
diff --git a/i18n/CMakeLists.txt b/i18n/CMakeLists.txt
index 909b968f..feb774ec 100644
--- a/i18n/CMakeLists.txt
+++ b/i18n/CMakeLists.txt
@@ -22,22 +22,22 @@ if(QT_LRELEASE_EXECUTABLE)
       set(gen_linguas "${gen_linguas} ${lang}")
     endif(flg)
   endforeach(TS_FILE ${avail_tsfiles})
-
-  # Write resource file
-  set(resfile ${CMAKE_CURRENT_BINARY_DIR}/i18n.qrc)
-  file(WRITE ${resfile} "<!DOCTYPE RCC><RCC version=\"1.0\">\n"
-                        "<qresource prefix=\"/i18n\">\n")
-  foreach(file ${qm_files})
-    get_filename_component(file ${file} NAME)
-    file(APPEND ${resfile} "    <file>${file}</file>\n")
-  endforeach(file ${qm_files})
-  file(APPEND ${resfile} "</qresource>\n</RCC>\n")
-  add_custom_command(OUTPUT ${resfile} DEPENDS ${qm_files})
-  #set_directory_properties(PROPERTIES
-  #      ADDITIONAL_MAKE_CLEAN_FILES "${outfiles} i18n.qrc")
-  qt4_add_resources(RC_I18N ${resfile})
-  add_custom_target(i18n DEPENDS ${RC_I18N})
   message(STATUS "Including languages:${gen_linguas}")
 else(QT_LRELEASE_EXECUTABLE)
   message(STATUS "WARNING: lrelease not found, you won't have translations!")
 endif(QT_LRELEASE_EXECUTABLE)
+
+# Write resource file
+set(resfile ${CMAKE_CURRENT_BINARY_DIR}/i18n.qrc)
+file(WRITE ${resfile} "<!DOCTYPE RCC><RCC version=\"1.0\">\n"
+                      "<qresource prefix=\"/i18n\">\n")
+foreach(file ${qm_files})
+  get_filename_component(file ${file} NAME)
+  file(APPEND ${resfile} "    <file>${file}</file>\n")
+endforeach(file ${qm_files})
+file(APPEND ${resfile} "</qresource>\n</RCC>\n")
+
+#add_custom_command(OUTPUT ${resfile} DEPENDS ${qm_files})
+set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${qm_files} i18n.qrc")
+qt4_add_resources(RC_I18N ${resfile})
+add_custom_target(i18n DEPENDS ${RC_I18N})