shorten and comment CoreUserInputHandler::handleJoin

[quassel.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2bdea50..7df9079 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,7 @@
 # -DWITH_DBUS=OFF        : Disable D-Bus support (dbus notifications)
 # -DWITH_WEBKIT=OFF      : Disable WebKit support (link previews)
 # -DWITH_PHONON=OFF      : Disable Phonon support (audio notifications)
+# -DWITH_LIBINDICATE=OFF : Disable libindicate support (Ayatana notifications)
 # -DWITH_KDE=ON          : Enable KDE4 support
 # -DWITH_OXYGEN=(ON|OFF) : Whether to install Oxygen icons (default: yes, unless KDE > 4.3.0 is present and enabled)
 #
@@ -40,6 +41,7 @@ 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(WITH_WEBKIT   "Enable WebKit support (for link previews)"       ON)
 option(WITH_PHONON   "Enable Phonon support (for audio notifications)" ON)
+option(WITH_LIBINDICATE "Enable Ayatana notification support"           ON)
 option(WITH_KDE      "Enable KDE4 integration"                         OFF)
 
 # We use icon paths from KDE 4.3.x, which are partially invalid on older and possibly
@@ -63,7 +65,6 @@ endif(STATIC OR WIN32)
 option(EMBED_DATA    "Embed all data files in the binary (rather than installing them separately)"   ${EMBED_DEFAULT})
 
 set(QT "" CACHE STRING "Path to a Qt installation to use instead of the system Qt (e.g. for static builds)")
-set(LINGUAS "" CACHE STRING "Comma-separated list of locales specifying languages that should be compiled")
 
 # Some settings imply others
 if(STATIC)
@@ -112,7 +113,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
 if(WANT_MONO OR WANT_QTCLIENT)
-  set(QT_MIN_VERSION "4.4.1") # Client crashes often with 4.4.0
+  set(QT_MIN_VERSION "4.5.0")
 else(WANT_MONO OR WANT_QTCLIENT)
   set(QT_MIN_VERSION "4.4.0")
 endif(WANT_MONO OR WANT_QTCLIENT)
@@ -149,7 +150,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)
@@ -177,7 +178,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
@@ -192,7 +193,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
@@ -211,7 +212,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
@@ -227,16 +228,25 @@ 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)
 
 # Setup libindicate-qt support
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(INDICATEQT indicate-qt)
-if(INDICATEQT_FOUND)
-  add_definitions(-DHAVE_INDICATEQT)
-endif(INDICATEQT_FOUND)
+if(WITH_LIBINDICATE)
+  find_package(PkgConfig QUIET)
+  if(PKG_CONFIG_FOUND)
+    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
 if(NOT HAVE_KDE)
@@ -290,7 +300,7 @@ if(INDICATEQT_FOUND)
   if(WANT_MONO)
     set(DESKTOP_FILE ${XDG_APPS_INSTALL_DIR}/quassel.desktop)
   endif(WANT_MONO)
-  add_definitions(-DDESKTOP_FILE=\"${DESKTOP_FILE}\")
+  add_definitions(-DDESKTOP_FILE=${DESKTOP_FILE})
 endif(INDICATEQT_FOUND)
 
 # We need to create a version.gen
@@ -312,5 +322,5 @@ set(CLIENT_DEPS )
 add_subdirectory(data)
 add_subdirectory(icons)
 add_subdirectory(pics)
-add_subdirectory(i18n)
+add_subdirectory(po)
 add_subdirectory(src)