From: Marcus Eggenberger Date: Sat, 27 Sep 2008 10:48:37 +0000 (+0200) Subject: fixing merge aftermath X-Git-Tag: 0.3.1~235 X-Git-Url: https://git.quassel-irc.org/?a=commitdiff_plain;h=3ff2a8a6d3750fc5b68af6faeece5b60e7a25f20;p=quassel.git fixing merge aftermath --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5bfc9407..c4f652af 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -39,7 +39,7 @@ if(WANT_CORE) endif(WANT_CORE) if(WANT_QTCLIENT) - setup_qt4_variables(${LINK_DBUS} GUI NETWORK) + setup_qt4_variables(${LINK_DBUS} GUI NETWORK WEBKIT) add_executable(quasselclient WIN32 common/main.cpp ${COMMON_DEPS} ${CLIENT_DEPS}) add_dependencies(quasselclient icons) set_target_properties(quasselclient PROPERTIES @@ -50,7 +50,7 @@ if(WANT_QTCLIENT) endif(WANT_QTCLIENT) if(WANT_MONO) - setup_qt4_variables(${LINK_DBUS} GUI NETWORK SCRIPT SQL) + setup_qt4_variables(${LINK_DBUS} GUI NETWORK SCRIPT SQL WEBKIT) add_executable(quassel WIN32 common/main.cpp qtui/monoapplication.cpp ${COMMON_DEPS} ${CLIENT_DEPS} ${CORE_DEPS}) add_dependencies(quassel icons) set_target_properties(quassel PROPERTIES