From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Mon, 31 Mar 2014 20:03:54 +0000 (+0200)
Subject: Bring back COMMON_DEPS
X-Git-Tag: 0.11.0~42
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=76292839bd070d54b4a95a13381dbce45b7cda26

Bring back COMMON_DEPS

This is actually being used to link the app icon on Windows, so bring
the old variables back for now. Probably want to clean this up later
though, as the naming is confusing.
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4d431e49..3575f527 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,7 +31,7 @@ if (WITH_OXYGEN)
 endif()
 
 if(WANT_CORE)
-  add_executable(quasselcore common/main.cpp)
+  add_executable(quasselcore common/main.cpp ${CORE_DEPS} ${COMMON_DEPS})
   qt_use_modules(quasselcore Core Network ${CORE_QT_MODULES})
   add_dependencies(quasselcore po)
   set_target_properties(quasselcore PROPERTIES
@@ -46,7 +46,7 @@ if (KDE4_FOUND)
 endif()
 
 if(WANT_QTCLIENT)
-  add_executable(quasselclient WIN32 common/main.cpp)
+  add_executable(quasselclient WIN32 common/main.cpp ${CLIENT_DEPS} ${COMMON_DEPS})
   qt_use_modules(quasselclient Core Gui Network ${CLIENT_QT_MODULES})
   add_dependencies(quasselclient po)
   set_target_properties(quasselclient PROPERTIES
@@ -57,7 +57,7 @@ if(WANT_QTCLIENT)
 endif(WANT_QTCLIENT)
 
 if(WANT_MONO)
-  add_executable(quassel WIN32 common/main.cpp qtui/monoapplication.cpp)
+  add_executable(quassel WIN32 common/main.cpp qtui/monoapplication.cpp ${CLIENT_DEPS} ${CORE_DEPS} ${COMMON_DEPS})
   qt_use_modules(quassel Core Gui Network ${CLIENT_QT_MODULES} ${CORE_QT_MODULES})
   add_dependencies(quassel po)
   set_target_properties(quassel PROPERTIES