projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tiny refactoring
[quassel.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
ba4dab8
..
a983dc4
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-151,7
+151,7
@@
include_directories(${QT_INCLUDES})
if(WITH_OPENSSL)
find_package(OpenSSL)
else(WITH_OPENSSL)
if(WITH_OPENSSL)
find_package(OpenSSL)
else(WITH_OPENSSL)
- message(STATUS "
Dis
abling OpenSSL support")
+ message(STATUS "
Not en
abling OpenSSL support")
endif(WITH_OPENSSL)
if(OPENSSL_FOUND)
endif(WITH_OPENSSL)
if(OPENSSL_FOUND)
@@
-179,7
+179,7
@@
if(WITH_DBUS)
message(STATUS "QtDBus not found, disabling D-Bus support")
endif(QT_QTDBUS_FOUND)
else(WITH_DBUS)
message(STATUS "QtDBus not found, disabling D-Bus support")
endif(QT_QTDBUS_FOUND)
else(WITH_DBUS)
- message(STATUS "
Dis
abling D-Bus support")
+ message(STATUS "
Not en
abling D-Bus support")
endif(WITH_DBUS)
# Setup QtWebKit support
endif(WITH_DBUS)
# Setup QtWebKit support
@@
-194,7
+194,7
@@
if(WITH_WEBKIT)
message(STATUS "QtWebKit not found, disabling WebKit support")
endif(QT_QTWEBKIT_FOUND)
else(WITH_WEBKIT)
message(STATUS "QtWebKit not found, disabling WebKit support")
endif(QT_QTWEBKIT_FOUND)
else(WITH_WEBKIT)
- message(STATUS "
Dis
abling WebKit support")
+ message(STATUS "
Not en
abling WebKit support")
endif(WITH_WEBKIT)
# Setup KDE4 support
endif(WITH_WEBKIT)
# Setup KDE4 support
@@
-213,7
+213,7
@@
if(WITH_KDE)
message(STATUS "KDE4 not found, disabling KDE integration")
endif(KDE4_FOUND)
else(WITH_KDE)
message(STATUS "KDE4 not found, disabling KDE integration")
endif(KDE4_FOUND)
else(WITH_KDE)
- message(STATUS "
Dis
abling KDE4 integration")
+ message(STATUS "
Not en
abling KDE4 integration")
endif(WITH_KDE)
# Setup Phonon support - we only need this if we don't have or want KDE4
endif(WITH_KDE)
# Setup Phonon support - we only need this if we don't have or want KDE4
@@
-229,7
+229,7
@@
if(NOT HAVE_KDE)
message(STATUS "Phonon not found, disabling audio notifications")
endif(PHONON_FOUND)
else(WITH_PHONON)
message(STATUS "Phonon not found, disabling audio notifications")
endif(PHONON_FOUND)
else(WITH_PHONON)
- message(STATUS "
Dis
abling Phonon support")
+ message(STATUS "
Not en
abling Phonon support")
endif(WITH_PHONON)
endif(NOT HAVE_KDE)
endif(WITH_PHONON)
endif(NOT HAVE_KDE)
@@
-237,11
+237,16
@@
endif(NOT HAVE_KDE)
if(WITH_LIBINDICATE)
find_package(PkgConfig QUIET)
if(PKG_CONFIG_FOUND)
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)
if(INDICATEQT_FOUND)
+ message(STATUS "Enabling Ayatana notification support")
add_definitions(-DHAVE_INDICATEQT)
add_definitions(-DHAVE_INDICATEQT)
+ else(INDICATEQT_FOUND)
+ message(STATUS "Disabling Ayatana notification support")
endif(INDICATEQT_FOUND)
endif(PKG_CONFIG_FOUND)
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
endif(WITH_LIBINDICATE)
# Now set up install locations; those are set by KDE if integration is enabled
@@
-296,7
+301,7
@@
if(INDICATEQT_FOUND)
if(WANT_MONO)
set(DESKTOP_FILE ${XDG_APPS_INSTALL_DIR}/quassel.desktop)
endif(WANT_MONO)
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
endif(INDICATEQT_FOUND)
# We need to create a version.gen