X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=75fffc1f42b024a006a22051a169b274574efbee;hp=ba4dab88748f3d632d3b4e451dc80ba00918060a;hb=eb7a1f8ffc97239e4c1f88e9da279694bba2f35a;hpb=ff0eb87665d476b39f2f3b192b8db31627e44adb

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba4dab88..75fffc1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,8 @@
 
 project(QuasselIRC)
 
-cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
+# cmake 2.6.2 is required for KDE >=4.2 and should be widespread enough now
+cmake_minimum_required(VERSION 2.6.2 FATAL_ERROR)
 
 if(COMMAND cmake_policy)
    cmake_policy(SET CMP0003 NEW)
@@ -107,12 +108,20 @@ endif(NOT CMAKE_BUILD_TYPE)
 if(CMAKE_COMPILER_IS_GNUCXX)
   # Let's just hope that all gccs support these options and skip the tests...
   # -fno-strict-aliasing is needed apparently for Qt < 4.6
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi -Wall -Wextra -Wnon-virtual-dtor -fno-strict-aliasing")
-  set(CMAKE_CXX_FLAGS_RELWITHDEBUGINFO "-O2")
-  set(CMAKE_CXX_FLAGS_DEBUG "-g -fno-reorder-blocks -fno-schedule-insns -fno-inline")
-  set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3")
+  set(CMAKE_CXX_FLAGS                  "${CMAKE_CXX_FLAGS} -ansi -Wall -Wextra -Wnon-virtual-dtor -fno-strict-aliasing")
+  set(CMAKE_CXX_FLAGS_RELEASE          "-O2 ${CMAKE_CXX_FLAGS}")
+  set(CMAKE_CXX_FLAGS_RELWITHDEBUGINFO "-g -O2 ${CMAKE_CXX_FLAGS}")
+  set(CMAKE_CXX_FLAGS_DEBUG            "-g -ggdb -fno-reorder-blocks -fno-schedule-insns -fno-inline ${CMAKE_CXX_FLAGS}")
+  set(CMAKE_CXX_FLAGS_DEBUGFULL        "-g3 ${CMAKE_CXX_FLAGS_DEBUG}")
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
+string(TOUPPER ${CMAKE_BUILD_TYPE} upper_build_type)
+if(upper_build_type STREQUAL "RELEASE" OR upper_build_type STREQUAL "RELWITHDEBUGINFO")
+  add_definitions(-DNDEBUG -DQT_NO_DEBUG)
+else(upper_build_type STREQUAL "RELEASE" OR upper_build_type STREQUAL "RELWITHDEBUGINFO")
+  set(DEBUG 1)
+endif(upper_build_type STREQUAL "RELEASE" OR upper_build_type STREQUAL "RELWITHDEBUGINFO")
+
 if(WANT_MONO OR WANT_QTCLIENT)
   set(QT_MIN_VERSION "4.4.1") # Client crashes often with 4.4.0
 else(WANT_MONO OR WANT_QTCLIENT)
@@ -151,7 +160,7 @@ include_directories(${QT_INCLUDES})
 if(WITH_OPENSSL)
   find_package(OpenSSL)
 else(WITH_OPENSSL)
-  message(STATUS "Disabling OpenSSL support")
+  message(STATUS "Not enabling OpenSSL support")
 endif(WITH_OPENSSL)
 
 if(OPENSSL_FOUND)
@@ -179,7 +188,7 @@ if(WITH_DBUS)
     message(STATUS "QtDBus not found, disabling D-Bus support")
   endif(QT_QTDBUS_FOUND)
 else(WITH_DBUS)
-  message(STATUS "Disabling D-Bus support")
+  message(STATUS "Not enabling D-Bus support")
 endif(WITH_DBUS)
 
 # Setup QtWebKit support
@@ -194,7 +203,7 @@ if(WITH_WEBKIT)
     message(STATUS "QtWebKit not found, disabling WebKit support")
   endif(QT_QTWEBKIT_FOUND)
 else(WITH_WEBKIT)
-  message(STATUS "Disabling WebKit support")
+  message(STATUS "Not enabling WebKit support")
 endif(WITH_WEBKIT)
 
 # Setup KDE4 support
@@ -213,7 +222,7 @@ if(WITH_KDE)
     message(STATUS "KDE4 not found, disabling KDE integration")
   endif(KDE4_FOUND)
 else(WITH_KDE)
-  message(STATUS "Disabling KDE4 integration")
+  message(STATUS "Not enabling KDE4 integration")
 endif(WITH_KDE)
 
 # Setup Phonon support - we only need this if we don't have or want KDE4
@@ -229,7 +238,7 @@ if(NOT HAVE_KDE)
       message(STATUS "Phonon not found, disabling audio notifications")
     endif(PHONON_FOUND)
   else(WITH_PHONON)
-    message(STATUS "Disabling Phonon support")
+    message(STATUS "Not enabling Phonon support")
   endif(WITH_PHONON)
 endif(NOT HAVE_KDE)
 
@@ -237,11 +246,16 @@ endif(NOT HAVE_KDE)
 if(WITH_LIBINDICATE)
   find_package(PkgConfig QUIET)
   if(PKG_CONFIG_FOUND)
-    pkg_check_modules(INDICATEQT indicate-qt)
+    pkg_check_modules(INDICATEQT indicate-qt>=0.2.1)
     if(INDICATEQT_FOUND)
+      message(STATUS "Enabling Ayatana notification support")
       add_definitions(-DHAVE_INDICATEQT)
+    else(INDICATEQT_FOUND)
+      message(STATUS "Disabling Ayatana notification support")
     endif(INDICATEQT_FOUND)
   endif(PKG_CONFIG_FOUND)
+else(WITH_LIBINDICATE)
+  message(STATUS "Not enabling Ayatana notification support")
 endif(WITH_LIBINDICATE)
 
 # Now set up install locations; those are set by KDE if integration is enabled
@@ -290,13 +304,7 @@ if(WIN32)
 endif(WIN32)
 
 if(INDICATEQT_FOUND)
-  if(WANT_QTCLIENT)
-    set(DESKTOP_FILE ${XDG_APPS_INSTALL_DIR}/quasselclient.desktop)
-  endif(WANT_QTCLIENT)
-  if(WANT_MONO)
-    set(DESKTOP_FILE ${XDG_APPS_INSTALL_DIR}/quassel.desktop)
-  endif(WANT_MONO)
-  add_definitions(-DDESKTOP_FILE="\\"${DESKTOP_FILE}\\"")
+  add_definitions(-DXDG_APPS_INSTALL_DIR=${XDG_APPS_INSTALL_DIR})
 endif(INDICATEQT_FOUND)
 
 # We need to create a version.gen