From ff0eb87665d476b39f2f3b192b8db31627e44adb Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Tue, 15 Sep 2009 10:57:10 +0200 Subject: [PATCH] Make Ayatana notifications optional -DWITH_LIBINDICATE=(ON|OFF) tells cmake to (not) check for libindicate-qt. Default is ON. --- CMakeLists.txt | 18 +++++++++++------- INSTALL | 3 +++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5dd553cf..ba4dab88 100644 --- 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 @@ -232,13 +234,15 @@ if(NOT HAVE_KDE) endif(NOT HAVE_KDE) # Setup libindicate-qt support -find_package(PkgConfig QUIET) -if(PKG_CONFIG_FOUND) - pkg_check_modules(INDICATEQT indicate-qt) - if(INDICATEQT_FOUND) - add_definitions(-DHAVE_INDICATEQT) - endif(INDICATEQT_FOUND) -endif(PKG_CONFIG_FOUND) +if(WITH_LIBINDICATE) + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) + pkg_check_modules(INDICATEQT indicate-qt) + if(INDICATEQT_FOUND) + add_definitions(-DHAVE_INDICATEQT) + endif(INDICATEQT_FOUND) + endif(PKG_CONFIG_FOUND) +endif(WITH_LIBINDICATE) # Now set up install locations; those are set by KDE if integration is enabled if(NOT HAVE_KDE) diff --git a/INSTALL b/INSTALL index a255e4bc..94e2000f 100644 --- a/INSTALL +++ b/INSTALL @@ -60,6 +60,9 @@ Quassel recognizes the following options: -DWITH_PHONON=OFF Disable support for audio notifications via Phonon. +-DWITH_LIBINDICATE=OFF + Disable support for Ayatana notifications (libindicate-qt) + -DLINGUAS=" Allow to choose which languages should be compiled into the binary. is a space- or comma-separated list of language codes. -- 2.20.1