X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=bc148063047bab765a730b0832ac9fb4df41800c;hp=e1b2427cb95af5d028b7fd939c4f795aa1dbcc5c;hb=556549cdf3058189d2439ac58ded7c39e69e94d7;hpb=d226ad424a16011a5751e80b853de7bc0b2e0674

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1b2427c..bc148063 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,21 @@ if(STATICWIN)
   set(CMAKE_BUILD_TYPE Release)
 endif(STATICWIN)
 
+# Enable various flags on gcc
+include(CheckCXXCompilerFlag)
+check_cxx_compiler_flag(-Wall Wall)
+if(Wall)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+endif(Wall)
+check_cxx_compiler_flag(-Wextra Wextra)
+if(Wextra)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
+endif(Wextra)
+check_cxx_compiler_flag(-ansi ansi)
+if(ansi)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi")
+endif(ansi)
+
 set(QT_MIN_VERSION "4.4.0")
 
 # By default, we build all binaries
@@ -55,6 +70,7 @@ if(SPUTDEV)
   add_definitions(-DSPUTDEV)
 endif(SPUTDEV)
 
+# Set up OpenSSL
 find_package(OpenSSL)
 
 # Select a Qt installation here, if you don't want to use system Qt
@@ -113,30 +129,23 @@ endif(DEFINED STATIC)
 
 if(STATICWIN AND WIN32)
   link_libraries(imm32 winmm)  # missing by default :/
-  if(OPENSSL_FOUND)
-    link_libraries(libeay32MD ssleay32MD)
-  endif(OPENSSL_FOUND)
+   if(OPENSSL_FOUND)
+     link_libraries(${OPENSSL_LIBRARIES} libeay32MD)
+   endif(OPENSSL_FOUND)
 endif(STATICWIN AND WIN32)
 
 if(WIN32)
   set(WIN32_RC src/icons/win32.rc)  # for app icons on windows
 endif(WIN32)
 
-# FIXME: Add icons for windows as soon as we have merged with trunk (which has reorganized
-#        the icon files):
-#        Simply add the .rc file to the targets
-
 # Here comes the dirty part. Our targets need different Qt4 modules, i.e. different libs
 # and defines. We can't simply include UseQt4 several times, since definitions add up.
 # We workaround this by using our own macro to figure out what to add.
 
 # This macro sets variables for additional Qt modules.
 macro(setup_qt4_variables)
-  set(QUASSEL_QT_DEFINITIONS ${QT_DEFINITIONS})
   set(QUASSEL_QT_LIBRARIES )
-  foreach(qtmod ${ARGV})
-    # This needs to be a string, not a list, otherwise set_target_properties screws up...
-    set(QUASSEL_QT_DEFINITIONS "${QUASSEL_QT_DEFINITIONS} -DQT_${qtmod}_LIB")
+  foreach(qtmod CORE ${ARGV})
     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})
@@ -147,7 +156,8 @@ if(BUILD_CORE)
   setup_qt4_variables(NETWORK SCRIPT SQL)
   add_executable(quasselcore ${CMAKE_SOURCE_DIR}/src/common/main.cpp
                              ${RC_SQL} ${RC_I18N} ${WIN32_RC})
-  set_target_properties(quasselcore PROPERTIES COMPILE_FLAGS "${QUASSEL_QT_DEFINITIONS} -DBUILD_CORE")
+  set_target_properties(quasselcore PROPERTIES 
+                                    COMPILE_FLAGS "-DQT_NETWORK_LIB -DQT_SCRIPT_LIB -DQT_SQL_LIB -DBUILD_CORE")
   target_link_libraries(quasselcore mod_core mod_common ${QUASSEL_QT_LIBRARIES})
 endif(BUILD_CORE)
 
@@ -155,7 +165,8 @@ if(BUILD_QTCLIENT)
   setup_qt4_variables(GUI NETWORK)
   add_executable(quasselclient ${CMAKE_SOURCE_DIR}/src/common/main.cpp
                                ${RC_ICONS} ${RC_QUASSEL_ICONS} ${RC_I18N} ${WIN32_RC})
-  set_target_properties(quasselclient PROPERTIES COMPILE_FLAGS "${QUASSEL_QT_DEFINITIONS} -DBUILD_QTUI")
+  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})
 endif(BUILD_QTCLIENT)
 
@@ -163,6 +174,17 @@ if(BUILD_MONO)
   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})
-  set_target_properties(quassel PROPERTIES COMPILE_FLAGS "${QUASSEL_QT_DEFINITIONS} -DBUILD_MONO")
+  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})
 endif(BUILD_MONO)
+
+# Build bundles for MacOSX
+if(APPLE)
+  add_custom_command(TARGET quasselclient POST_BUILD
+                     COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makebundle.py
+                             ${CMAKE_SOURCE_DIR} "Quassel Client" quasselclient)
+  add_custom_command(TARGET quassel POST_BUILD
+                     COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makebundle.py
+                             ${CMAKE_SOURCE_DIR} "Quassel" quassel)
+endif(APPLE)