projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
03d6711
)
fixing merge aftermath
author
Marcus Eggenberger
<egs@quassel-irc.org>
Sat, 27 Sep 2008 10:48:37 +0000
(12:48 +0200)
committer
Marcus Eggenberger
<egs@quassel-irc.org>
Sat, 27 Sep 2008 11:47:20 +0000
(13:47 +0200)
src/CMakeLists.txt
patch
|
blob
|
history
diff --git
a/src/CMakeLists.txt
b/src/CMakeLists.txt
index
5bfc940
..
c4f652a
100644
(file)
--- a/
src/CMakeLists.txt
+++ b/
src/CMakeLists.txt
@@
-39,7
+39,7
@@
if(WANT_CORE)
endif(WANT_CORE)
if(WANT_QTCLIENT)
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
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)
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
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