X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=bf34d35d48d866cc990ad4a1ee32ae1c8650c7fc;hp=d9d8aa5f2d4b512c6c03b5dc85d56ae1f2b86f13;hb=4bee97e877d9ba4677ab90456377822da6203e29;hpb=c3d1cf8b2fd6eedbaa342ade567cc573a05861e8

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9d8aa5f..bf34d35d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,22 @@ if(STATICWIN)
   set(CMAKE_BUILD_TYPE Release)
 endif(STATICWIN)
 
-set(QT_MIN_VERSION "4.4.0")
+# 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.3.0")
 
 # By default, we build all binaries
 if(NOT DEFINED BUILD)
@@ -123,21 +138,14 @@ 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 CORE ${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")
     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})
@@ -148,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 "-DQT_NETWORK_LIB -DQT_SCRIPT_LIB -DQT_SQL_LIB -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)
 
@@ -156,18 +165,48 @@ 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 "-DQT_GUI_LIB -DQT_NETWORK_LIB -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})
-  add_custom_command(TARGET quasselclient POST_BUILD COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makebundle.py ${CMAKE_SOURCE_DIR} "Quassel Client" quasselclient)
 endif(BUILD_QTCLIENT)
 
 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 "-DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_SCRIPT_LIB -DQT_SQL_LIB -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})
-  add_custom_command(TARGET quassel POST_BUILD COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makebundle.py ${CMAKE_SOURCE_DIR} "Quassel" quassel)
 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)
+
+# Install rules
+if(BUILD_CORE)
+  install(TARGETS quasselcore
+          RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+endif(BUILD_CORE)
+
+if(BUILD_QTCLIENT)
+  install(TARGETS quasselclient
+          RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+
+  install(FILES quasselclient.desktop
+          DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+endif(BUILD_QTCLIENT)
 
+if(BUILD_MONO)
+  install(TARGETS quassel
+          RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+
+  install(FILES quassel.desktop
+          DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+endif(BUILD_MONO)