[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:38 UTC 2016


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

The following commit has been merged in the master branch:
commit a609a899d4be321cc63d36ab078361fd290d8a14
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Wed Nov 12 15:03:19 2014 +0100

    QJson is not needed anymore
---
 cmake/modules/FindQJSON.cmake | 48 -------------------------------------------
 1 file changed, 48 deletions(-)

diff --git a/cmake/modules/FindQJSON.cmake b/cmake/modules/FindQJSON.cmake
deleted file mode 100644
index 4781c0a..0000000
--- a/cmake/modules/FindQJSON.cmake
+++ /dev/null
@@ -1,48 +0,0 @@
-# Find QJSON - JSON handling library for Qt
-#
-# This module defines
-#  QJSON_FOUND - whether the qsjon library was found
-#  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.
-
-# 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
-# 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")
-    if (qjson_LIBRARIES)
-        set (QJSON_LIBRARIES ${qjson_LIBRARIES})
-    endif()
-    if (qjson_INCLUDE_DIR)
-        set (QJSON_INCLUDE_DIR ${qjson_INCLUDE_DIR})
-    endif()
-endif()
-
-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
-        HINTS ${PC_QJSON_LIBDIR} ${PC_QJSON_LIBRARY_DIRS}
-    )
-
-    find_path(QJSON_INCLUDE_DIR
-        NAMES qjson/parser.h
-        HINTS ${PC_QJSON_INCLUDEDIR} ${PC_QJSON_INCLUDE_DIRS}
-    )
-
-    set(REQUIRED_LIBS QJSON_LIBRARIES QJSON_INCLUDE_DIR)
-endif (QJSON_FOUND)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(QJSON DEFAULT_MSG ${REQUIRED_LIBS})

-- 
ktp-auth-handler packaging



More information about the pkg-kde-commits mailing list