X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=c82460948904f6b9fa35ecbdad646cd7be948f27;hp=29fd9630db63fb5dd41249dafb3a081ba150a214;hb=7f586ab22eee4c914901c608304d1da144bc3789;hpb=a33e42aee121185f479667b2104a15fc2033762e

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29fd9630..c8246094 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,13 @@
 # This is the cmake-based build system for Quassel IRC.
 # You may pass various options to cmake:
 # -DWANT_(CORE|QTCLIENT|MONO)=(ON|OFF)
-#                  : select binaries to build
-# -DQT=/path/to/qt : Choose a Qt4 installation to use instead of the system Qt4
-# -DSTATIC=ON      : Enable static building of Quassel. Use with care.
-# -DSPUTDEV=ON     : Do not use.
-# -DDEPLOY=ON      : Mac OS X only. Use only fore redistribution Quassel Packages!!
+#                     : select binaries to build
+# -DWITH_OPENSSL=OFF  : Disable OpenSSL support
+# -DWITH_DBUS=OFF     : Disable D-Bus support
+# -DQT=/path/to/qt    : Choose a Qt4 installation to use instead of the system Qt4
+# -DSTATIC=ON         : Enable static building of Quassel. Use with care.
+# -DSPUTDEV=ON        : Do not use.
+# -DDEPLOY=ON         : Mac OS X only. Use only fore redistribution Quassel Packages!!
 #
 # NOTE: You need to remove CMakeCache.txt if you plan to change any of these values!
 
@@ -15,7 +17,7 @@ project(QuasselIRC)
 cmake_minimum_required(VERSION 2.4.7 FATAL_ERROR)
 
 if(COMMAND cmake_policy)
-   cmake_policy(SET CMP0003 OLD)  # suppress linker warnings
+   cmake_policy(SET CMP0003 NEW)
 endif(COMMAND cmake_policy)
 
 # Use our own (well, KDE's) version of some modules
@@ -27,40 +29,37 @@ option(WANT_CORE     "Build the core (server) binary"           ON)
 option(WANT_QTCLIENT "Build the Qt4 GUI client binary"          ON)
 option(WANT_MONO     "Build the monolithic (all-in-one) binary" OFF)
 
+option(WITH_OPENSSL  "Enable OpenSSL support if present on the system"	ON)
+option(WITH_DBUS     "Enable D-Bus support if present on the system"	ON)
+
 option(STATIC        "Enable static building (might not be portable)" OFF)
 option(DEPLOY        "Mac OS X only! Adds required libs to bundle resources and create a dmg. Note: requires Qt to be built with 10.4u SDK" OFF)
 option(SPUTDEV       "Do not use!" OFF)
 
 set(QT "" CACHE STRING "Path to a Qt installation to use instead of the system Qt")
 set(LINGUAS "" CACHE STRING "Space-separated List of locales specifying languages that should be compiled")
- 
+
 if(STATIC)
   set(CMAKE_BUILD_TYPE Release)
 endif(STATIC)
 
+# RPATH needs to be set correctly
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1) 
+set(CMAKE_BUILD_WITH_INSTALL_RPATH 1)
+
 # Enable various flags on gcc
 if(CMAKE_COMPILER_IS_GNUCXX)
-  include(CheckCXXCompilerFlag)
-  check_cxx_compiler_flag(-Wall HAVE_WALL)
-  if(HAVE_WALL)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-  endif(HAVE_WALL)
-  check_cxx_compiler_flag(-Wextra HAVE_WEXTRA)
-  if(HAVE_WEXTRA)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
-  endif(HAVE_WEXTRA)
-  check_cxx_compiler_flag(-ansi HAVE_ANSI)
-  if(HAVE_ANSI)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi")
-  endif(HAVE_ANSI)
+  # Let's just hope that all gccs support these options and skip the tests...
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi -Wall -Wextra -Wnon-virtual-dtor")
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
-set(QT_MIN_VERSION "4.3.0")
+set(QT_MIN_VERSION "4.4.0")
 
 if(APPLE AND DEPLOY)
   set(CMAKE_OSX_ARCHITECTURES "i386;ppc")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.4")
   set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk/")
+  add_definitions(-DMAC_10_4_SDK)
 endif(APPLE AND DEPLOY)
 
 # Enable mostly b0rked stuff (new ChatView), do not enable this unless you know what you do...
@@ -68,11 +67,39 @@ if(SPUTDEV)
   add_definitions(-DSPUTDEV)
 endif(SPUTDEV)
 
-# Set up OpenSSL
-find_package(OpenSSL)
-if(NOT OPENSSL_FOUND)
-  add_definitions(-DQT_NO_OPENSSL)
-endif(NOT OPENSSL_FOUND)
+# Set up execinfo
+
+# The problem with this library is that it is built-in in the Linux glib, 
+# while on systems like FreeBSD, it is installed separately and thus needs to be linked to.
+# Therefore, we search for the header to see if the it's available in the first place.
+# If it is available, we try to locate the library to figure out whether it is built-in or not.
+
+find_path(EXECINFO_H_DIR "execinfo.h")
+
+if(NOT EXECINFO_H_DIR STREQUAL "EXECINFO_H_DIR-NOTFOUND")
+  # We found the header file's include dir.
+  # Let's add it so the compiler finds it as well.
+  include_directories(${EXECINFO_H_DIR})
+
+  # Now determine if it's built-in or not, by searching the library file.
+  find_library(EXECINFO_LIB_PATH "execinfo")
+
+  if(EXECINFO_LIB_PATH STREQUAL "EXECINFO_LIB_PATH-NOTFOUND")
+    # Built-in, no further action is needed
+    message(STATUS "Found execinfo")
+  else(EXECINFO_LIB_PATH STREQUAL "EXECINFO_LIB_PATH-NOTFOUND")
+    # It's an external library, link it.
+    link_libraries(${EXECINFO_LIB_PATH})
+    message(STATUS "Found execinfo: ${EXECINFO_LIB_PATH}")
+  endif(EXECINFO_LIB_PATH STREQUAL "EXECINFO_LIB_PATH-NOTFOUND")
+
+  set(HAVE_EXECINFO true)
+
+endif(NOT EXECINFO_H_DIR STREQUAL "EXECINFO_H_DIR-NOTFOUND")
+
+if(HAVE_EXECINFO)
+  add_definitions(-DHAVE_EXECINFO)
+endif(HAVE_EXECINFO)
 
 # Select a Qt installation here, if you don't want to use system Qt
 if(QT)
@@ -87,12 +114,48 @@ set(QT_DONT_USE_QTGUI 1)
 include(${QT_USE_FILE})
 include_directories(${QT_INCLUDES})
 
+# Setup OpenSSL
+if(WITH_OPENSSL)
+  find_package(OpenSSL)
+else(WITH_OPENSSL)
+  message(STATUS "Disabling OpenSSL support")
+endif(WITH_OPENSSL)
+
+if(OPENSSL_FOUND)
+  if(NOT QT_DEFINITIONS MATCHES "QT_NO_OPENSSL")
+    message(STATUS "Found OpenSSL support in Qt")
+    add_definitions(-DHAVE_SSL)
+    set(HAVE_SSL true)
+    set(MOC_DEFINES ${MOC_DEFINES} -DHAVE_SSL)
+  else(NOT QT_DEFINITIONS MATCHES "QT_NO_OPENSSL")
+    message(STATUS "No OpenSSL support found in Qt, disabling")
+  endif(NOT QT_DEFINITIONS MATCHES "QT_NO_OPENSSL")
+else(OPENSSL_FOUND)
+  add_definitions(-DQT_NO_OPENSSL)
+endif(OPENSSL_FOUND)
+
+# Setup D-Bus support
+if(WITH_DBUS)
+  if(QT_QTDBUS_FOUND)
+    message(STATUS "Found QtDBus, enabling D-Bus support")
+    add_definitions(-DHAVE_DBUS)
+    set(LINK_DBUS DBUS)
+    set(HAVE_DBUS true)
+    set(MOC_DEFINES ${MOC_DEFINES} -DHAVE_DBUS)
+  else(QT_QTDBUS_FOUND)
+    message(STATUS "QtDBus not found, disabling D-Bus support")
+  endif(QT_QTDBUS_FOUND)
+else(WITH_DBUS)
+  message(STATUS "Disabling D-Bus support")
+endif(WITH_DBUS)
+
 # We need to create a version.gen
 # For this, we create our genversion binary and make sure it is run every time.
 add_executable(genversion ${CMAKE_SOURCE_DIR}/src/common/genversion.cpp)
 target_link_libraries(genversion ${QT_LIBRARIES} ${QT_CORE_LIB_DEPENDENCIES})
 
-add_custom_target(genversion_run ALL ${CMAKE_BINARY_DIR}/genversion
+get_target_property(GENVERSION_EXECUTABLE genversion LOCATION)
+add_custom_target(genversion_run ALL ${GENVERSION_EXECUTABLE}
                   ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/src/common/version.gen)
 add_dependencies(genversion_run genversion)
 
@@ -130,16 +193,16 @@ qt4_add_resources(RC_SQL src/core/sql.qrc)
 if(STATIC AND CMAKE_COMPILER_IS_GNUCXX)
   set(CMAKE_CXX_FLAGS "-static-libgcc ${CMAKE_CXX_FLAGS}")
   link_directories(${CMAKE_BINARY_DIR}/staticlibs) # override dynamic libs
-  if(OPENSSL_FOUND)
+  if(HAVE_SSL)
     set(QUASSEL_SSL_LIBRARIES ssl crypto)  # these miss in static builds
-  endif(OPENSSL_FOUND)
+  endif(HAVE_SSL)
 endif(STATIC AND CMAKE_COMPILER_IS_GNUCXX)
 
 if(STATIC AND WIN32)
   link_libraries(imm32 winmm)  # missing by default :/
-   if(OPENSSL_FOUND)
+   if(HAVE_SSL)
      link_libraries(${OPENSSL_LIBRARIES} libeay32MD)
-   endif(OPENSSL_FOUND)
+   endif(HAVE_SSL)
 endif(STATIC AND WIN32)
 
 if(WIN32)
@@ -165,7 +228,7 @@ endmacro(setup_qt4_variables)
 # Now we have everything, so just glue the right pieces together :)
 if(WANT_CORE)
   setup_qt4_variables(NETWORK SCRIPT SQL)
-  add_executable(quasselcore ${CMAKE_SOURCE_DIR}/src/common/main.cpp
+  add_executable(quasselcore 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")
@@ -174,8 +237,8 @@ if(WANT_CORE)
 endif(WANT_CORE)
 
 if(WANT_QTCLIENT)
-  setup_qt4_variables(GUI NETWORK)
-  add_executable(quasselclient WIN32 ${CMAKE_SOURCE_DIR}/src/common/main.cpp
+  setup_qt4_variables(${LINK_DBUS} GUI NETWORK)
+  add_executable(quasselclient WIN32 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")
@@ -184,8 +247,8 @@ if(WANT_QTCLIENT)
 endif(WANT_QTCLIENT)
 
 if(WANT_MONO)
-  setup_qt4_variables(GUI NETWORK SCRIPT SQL)
-  add_executable(quassel WIN32 ${CMAKE_SOURCE_DIR}/src/common/main.cpp
+  setup_qt4_variables(${LINK_DBUS} GUI NETWORK SCRIPT SQL)
+  add_executable(quassel WIN32 src/common/main.cpp src/qtui/monoapplication.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")