From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Tue, 17 Jun 2008 18:31:07 +0000 (+0200)
Subject: Merge branch 'cmake'
X-Git-Tag: 0.3.0~371
X-Git-Url: https://git.quassel-irc.org/?a=commitdiff_plain;h=c9ee7972b2c9b84e37f363befa05bf5fb04114af;p=quassel.git

Merge branch 'cmake'

Mangled the CMakeLists.txt a bit to make WIN32 support less fugly
---

c9ee7972b2c9b84e37f363befa05bf5fb04114af
diff --cc CMakeLists.txt
index cf1a80be,5088178d..0f481a43
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -132,7 -123,7 +132,10 @@@ endif(WIN32
  # This macro sets variables for additional Qt modules.
  macro(setup_qt4_variables)
    set(QUASSEL_QT_LIBRARIES )
--  foreach(qtmod CORE ${ARGV})
++  IF(WIN32)
++    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})
    endforeach(qtmod ${ARGV})
    set(QUASSEL_QT_LIBRARIES ${QUASSEL_QT_LIBRARIES} ${QT_LIBRARIES})
@@@ -150,23 -140,21 +153,23 @@@ if(WANT_CORE
  endif(WANT_CORE)
  
  if(WANT_QTCLIENT)
 -  setup_qt4_variables(GUI NETWORK MAIN)
 +  setup_qt4_variables(GUI NETWORK)
-   add_executable(quasselclient ${CMAKE_SOURCE_DIR}/src/common/main.cpp
-                                ${RC_ICONS} ${RC_QUASSEL_ICONS} ${RC_I18N} ${WIN32_RC})
+   add_executable(quasselclient WIN32 ${CMAKE_SOURCE_DIR}/src/common/main.cpp
 -                               ${RC_ICONS} ${RC_QUASSEL_ICONS} ${RC_I18N} ${WIN32_RC})
++                                     ${RC_ICONS} ${RC_QUASSEL_ICONS} ${RC_I18N} ${WIN32_RC})
    set_target_properties(quasselclient PROPERTIES
                                        COMPILE_FLAGS "-DQT_GUI_LIB -DQT_NETWORK_LIB -DBUILD_QTUI")
 -  target_link_libraries(quasselclient mod_qtui mod_uisupport mod_client mod_common ${QUASSEL_QT_LIBRARIES})
 +  target_link_libraries(quasselclient mod_qtui mod_uisupport mod_client mod_common
 +                                      ${QUASSEL_QT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES})
  endif(WANT_QTCLIENT)
  
  if(WANT_MONO)
 -  setup_qt4_variables(GUI NETWORK SCRIPT SQL MAIN)
 +  setup_qt4_variables(GUI NETWORK SCRIPT SQL)
-   add_executable(quassel ${CMAKE_SOURCE_DIR}/src/common/main.cpp
-                          ${RC_ICONS} ${RC_QUASSEL_ICONS} ${RC_SQL} ${RC_I18N} ${WIN32_RC})
+   add_executable(quassel WIN32 ${CMAKE_SOURCE_DIR}/src/common/main.cpp
 -                         ${RC_ICONS} ${RC_QUASSEL_ICONS} ${RC_SQL} ${RC_I18N} ${WIN32_RC})
++                               ${RC_ICONS} ${RC_QUASSEL_ICONS} ${RC_SQL} ${RC_I18N} ${WIN32_RC})
    set_target_properties(quassel PROPERTIES 
                                  COMPILE_FLAGS "-DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_SCRIPT_LIB -DQT_SQL_LIB -DBUILD_MONO")
 -  target_link_libraries(quassel mod_qtui mod_uisupport mod_client mod_core mod_common ${QUASSEL_QT_LIBRARIES})
 +  target_link_libraries(quassel mod_qtui mod_uisupport mod_client mod_core mod_common 
 +                                ${QUASSEL_QT_LIBRARIES} ${QUASSEL_SSL_LIBRARIES})
  endif(WANT_MONO)
  
  # Build bundles for MacOSX