[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=ba6f331

The following commit has been merged in the master branch:
commit ba6f33172a09d02f0ebb72d0c129b0c21f8af5c2
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Feb 15 23:10:16 2013 +0000

    Update FindQJSON to match one found from KDEPIM
---
 cmake/modules/FindQJSON.cmake | 56 ++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 33 deletions(-)

diff --git a/cmake/modules/FindQJSON.cmake b/cmake/modules/FindQJSON.cmake
index c237b0f..fad5905 100644
--- a/cmake/modules/FindQJSON.cmake
+++ b/cmake/modules/FindQJSON.cmake
@@ -5,42 +5,32 @@
 #  QJSON_LIBRARIES - the qjson library
 #  QJSON_INCLUDE_DIR - the include path of the qjson library
 #
+# Copyright (C) 2012 Raphael Kubo da Costa <rakuco at FreeBSD.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-if (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
-
-  # Already in cache
-  set (QJSON_FOUND TRUE)
+# QJSON v0.7.2+ provides a QJSONConfig.cmake, which should be used if found.
+find_package(QJSON QUIET NO_MODULE)
 
-else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
-#
-#   if (NOT WIN32)
-#     # use pkg-config to get the values of QJSON_INCLUDE_DIRS
-#     # and QJSON_LIBRARY_DIRS to add as hints to the find commands.
-#     include (FindPkgConfig)
-#     pkg_check_modules (QJSON REQUIRED QJson>=0.5)
-#   endif (NOT WIN32)
+if (QJSON_FOUND)
+    set(REQUIRED_LIBS QJSON_CONFIG)
+else (QJSON_FOUND)
+    find_package(PkgConfig)
+    pkg_check_modules(PC_QJSON QJson>=0.5)
 
-  find_library (QJSON_LIBRARIES
-    NAMES
-    qjson
-    PATHS
-    ${QJSON_LIBRARY_DIRS}
-    ${LIB_INSTALL_DIR}
-    ${KDE4_LIB_DIR}
-  )
+    find_library(QJSON_LIBRARIES
+        NAMES qjson
+        HINTS ${PC_QJSON_LIBDIR} ${PC_QJSON_LIBRARY_DIRS}
+    )
 
-  find_path (QJSON_INCLUDE_DIR
-    NAMES
-    parser.h
-    PATH_SUFFIXES
-    qjson
-    PATHS
-    ${QJSON_INCLUDE_DIRS}
-    ${INCLUDE_INSTALL_DIR}
-    ${KDE4_INCLUDE_DIR}
-  )
+    find_path(QJSON_INCLUDE_DIR
+        NAMES qjson/parser.h
+        HINTS ${PC_QJSON_INCLUDEDIR} ${PC_QJSON_INCLUDE_DIRS}
+    )
 
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(QJSON DEFAULT_MSG QJSON_LIBRARIES QJSON_INCLUDE_DIR)
+    set(REQUIRED_LIBS QJSON_LIBRARIES QJSON_INCLUDE_DIR)
+endif (QJSON_FOUND)
 
-endif (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(QJSON DEFAULT_MSG ${REQUIRED_LIBS})

-- 
ktp-auth-handler packaging