[SCM] ktp-auth-handler packaging branch, master, updated. debian/15.12.1-2-282-g080758e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=3642482

The following commit has been merged in the master branch:
commit 364248282d3f9253c453b75aabdf5e5ea92529b7
Author: Daniele E. Domenichelli <ddomenichelli at kde.org>
Date:   Thu Mar 14 01:56:51 2013 +0100

    Fix build on debian testing
    
    Was broken because debian fixes it in the installed package
    
    Reviewed-by: Rohan Garg
---
 cmake/modules/FindQJSON.cmake | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/cmake/modules/FindQJSON.cmake b/cmake/modules/FindQJSON.cmake
index 3051c81..4152c1c 100644
--- a/cmake/modules/FindQJSON.cmake
+++ b/cmake/modules/FindQJSON.cmake
@@ -14,9 +14,15 @@
 find_package(QJSON QUIET NO_MODULE)
 
 # QJSON <=0.7.1 provide variables with lower case prefix
+# This happens only on some distribution, so we check if the lowercase
+# variable is set, before setting the uppercase one.
 if (${QJSON_VERSION} VERSION_LESS "0.7.2")
-    set (QJSON_LIBRARIES   ${qjson_LIBRARIES})
-    set (QJSON_INCLUDE_DIR ${qjson_INCLUDE_DIR})
+    if (qtjson_LIBRARIES)
+        set (QJSON_LIBRARIES ${qjson_LIBRARIES})
+    endif()
+    if (qjson_INCLUDE_DIR)
+        set (QJSON_INCLUDE_DIR ${qjson_INCLUDE_DIR})
+    endif()
 endif()
 
 if (QJSON_FOUND)

-- 
ktp-auth-handler packaging