X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=721e339cfbb9c15ac31e8bad4f264340afb29e48;hp=a59ab825c6a2d458eeff1b0a4bd84e16762c481e;hb=48dda5f3e963e13e36300ddaef262660bf169672;hpb=41f7cd2411c6500bd6a07be63f3adb1c0eb890a7

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a59ab825..721e339c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@
 set(QUASSEL_MAJOR  0)
 set(QUASSEL_MINOR 13)
 set(QUASSEL_PATCH  0)
-set(QUASSEL_VERSION_STRING "0.13-pre")
+set(QUASSEL_VERSION_STRING "0.13-rc1")
 
 # Build type
 if (CMAKE_CONFIGURATION_TYPES)
@@ -350,7 +350,7 @@ if (USE_QT5)
         if (ECM_FOUND)
             list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
             if (WITH_KDE)
-                find_package(KF5 COMPONENTS ConfigWidgets CoreAddons Notifications NotifyConfig TextWidgets WidgetsAddons XmlGui QUIET)
+                find_package(KF5 COMPONENTS ConfigWidgets CoreAddons Notifications NotifyConfig Sonnet TextWidgets WidgetsAddons XmlGui QUIET REQUIRED)
                 set_package_properties(KF5 PROPERTIES TYPE REQUIRED
                     URL "http://www.kde.org"
                     DESCRIPTION "KDE Frameworks"
@@ -571,7 +571,7 @@ if (KDE4_FOUND)
     set(EMBED_DATA OFF)
 
     # Better have the compile flags global, even for the core, to avoid problems with linking the mono client
-    add_definitions(-DHAVE_KDE -DHAVE_KDE4 ${KDE4_DEFINITIONS})
+    add_definitions(-DHAVE_KDE -DHAVE_KDE4 ${KDE4_DEFINITIONS} ${KDE4_ENABLE_EXCEPTIONS})
     set(WITH_KDE4 TRUE)
 endif()
 
@@ -583,6 +583,7 @@ if (USE_QT5 AND WITH_KDE)
     include(KDECompilerSettings)
     include(KDECMakeSettings)
 
+    kde_enable_exceptions()
     add_definitions(-DHAVE_KDE -DHAVE_KF5)
     set(WITH_KF5 TRUE)
 endif()