X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=70b05c93d2747dc3fd07bbb2e43e461dfa517a3b;hp=e2d5f48be061c957a9603c02b01dc7d937d5c4d0;hb=2d34cee94202d11702881ddcd7bf80717f87f8c3;hpb=d68e9d67200abc51123b357bcdbbc816d4a70791

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2d5f48b..70b05c93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -256,6 +256,12 @@ if (USE_QT5)
         endif()
 
         if (WITH_KDE)
+            find_package(KF5TextWidgets QUIET)
+            set_package_properties(KF5TextWidgets PROPERTIES TYPE REQUIRED
+                URL "http://inqlude.org/libraries/ktextwidgets.html"
+                DESCRIPTION "framework providing an assortment of widgets for displaying and editing text"
+                PURPOSE     "Allows to use extra features provided by KDE Frameworks in input widgets"
+            )
 
         endif()
 
@@ -430,8 +436,8 @@ 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 ${KDE4_DEFINITIONS})
-    set(HAVE_KDE4 TRUE)
+    add_definitions(-DHAVE_KDE -DHAVE_KDE4 ${KDE4_DEFINITIONS})
+    set(WITH_KDE4 TRUE)
 endif()
 
 if (USE_QT5 AND WITH_KDE)
@@ -442,8 +448,8 @@ if (USE_QT5 AND WITH_KDE)
     include(KDECompilerSettings)
     include(KDECMakeSettings)
 
-    add_definitions(-DHAVE_KF5)
-    set(HAVE_KF5 TRUE)
+    add_definitions(-DHAVE_KDE -DHAVE_KF5)
+    set(WITH_KF5 TRUE)
 endif()
 
 # This needs to come after setting up KDE integration, so we can use KDE-specific paths
@@ -546,6 +552,17 @@ include(GetGitRevisionDescription)
 get_git_head_revision(GIT_REFSPEC GIT_HEAD)
 git_describe(GIT_DESCRIBE --long)
 
+# If not in a Git repo try to read GIT_HEAD and GIT_DESCRIBE from
+# enviroment
+if (NOT GIT_HEAD OR NOT GIT_DESCRIBE)
+  if (ENV_GIT_HEAD)
+      set(GIT_HEAD ${ENV_GIT_HEAD}) 
+  endif ()
+  if (ENV_GIT_DESCRIBE)
+     set(GIT_DESCRIBE ${ENV_GIT_DESCRIBE})
+  endif()
+endif()
+
 # Sanitize things if we're not in a Git repo
 if (NOT GIT_HEAD OR NOT GIT_DESCRIBE)
     set(GIT_HEAD "")