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

Maximiliano Curia maxy at moszumanska.debian.org
Fri May 27 23:59:00 UTC 2016


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

The following commit has been merged in the master branch:
commit c2614b7a3504ed3dd798729f662e8433e5499d4c
Author: Florian Reinhard <florian.reinhard at googlemail.com>
Date:   Tue Mar 12 08:40:33 2013 +0100

    Add workaround for linking issue with qjson <= 0.7.1
    
    credits for idea: Rohan Garg
    
    BUG: 316564
    REVIEW: 109445
---
 cmake/modules/FindQJSON.cmake | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cmake/modules/FindQJSON.cmake b/cmake/modules/FindQJSON.cmake
index fad5905..3051c81 100644
--- a/cmake/modules/FindQJSON.cmake
+++ b/cmake/modules/FindQJSON.cmake
@@ -13,6 +13,12 @@
 # QJSON v0.7.2+ provides a QJSONConfig.cmake, which should be used if found.
 find_package(QJSON QUIET NO_MODULE)
 
+# QJSON <=0.7.1 provide variables with lower case prefix
+if (${QJSON_VERSION} VERSION_LESS "0.7.2")
+    set (QJSON_LIBRARIES   ${qjson_LIBRARIES})
+    set (QJSON_INCLUDE_DIR ${qjson_INCLUDE_DIR})
+endif()
+
 if (QJSON_FOUND)
     set(REQUIRED_LIBS QJSON_CONFIG)
 else (QJSON_FOUND)

-- 
ktp-auth-handler packaging



More information about the pkg-kde-commits mailing list