From b552b3cae935b8e9aadbc00d2f03cf421c5fc868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=99emysl=20Janouch?= <p.janouch@gmail.com>
Date: Tue, 15 Mar 2016 22:12:14 +0100
Subject: Use pkg-config for json-glib-1.0

---
 CMakeLists.txt           |  3 +--
 cmake/FindJsonGlib.cmake | 62 ------------------------------------------------
 2 files changed, 1 insertion(+), 64 deletions(-)
 delete mode 100644 cmake/FindJsonGlib.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3222b60..c1ae05e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,9 +78,8 @@ if (CONVERT_EXECUTABLE AND NOT WIN32)
 endif (CONVERT_EXECUTABLE AND NOT WIN32)
 
 # Dependencies
-find_package (JsonGlib REQUIRED)
 find_package (PkgConfig REQUIRED)
-pkg_check_modules (GTK3 REQUIRED gtk+-3.0)
+pkg_check_modules (GTK3 REQUIRED gtk+-3.0 json-glib-1.0)
 
 if (NOT WIN32)
 	pkg_search_module (Lua52 REQUIRED lua5.2 lua-5.2 lua>=5.2)
diff --git a/cmake/FindJsonGlib.cmake b/cmake/FindJsonGlib.cmake
deleted file mode 100644
index c279de1..0000000
--- a/cmake/FindJsonGlib.cmake
+++ /dev/null
@@ -1,62 +0,0 @@
-# - Find json-glib
-# This module looks for json-glib.
-# This module defines the following values:
-#    JSON_GLIB_FOUND
-#    JSON_GLIB_INCLUDE_DIRS
-#    JSON_GLIB_LIBRARIES
-
-#=============================================================================
-# Copyright Přemysl Janouch 2010
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-# OF SUCH DAMAGE.
-#=============================================================================
-
-find_path (JSON_GLIB_INCLUDE_DIR json-glib/json-glib.h
-	PATH_SUFFIXES json-glib-1.0)
-
-find_path (JSON_GLIB_INCLUDE_DIR_GOBJECT glib-object.h
-	PATH_SUFFIXES glib-2.0)
-
-if (CMAKE_LIBRARY_ARCHITECTURE)
-	set (_json_glib_arch_dir /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE})
-endif (CMAKE_LIBRARY_ARCHITECTURE)
-
-find_path (JSON_GLIB_INCLUDE_DIR_GLIBCONFIG glibconfig.h
-	PATHS ${_json_glib_arch_dir} /usr/lib
-	PATH_SUFFIXES glib-2.0 glib-2.0/include)
-
-find_library (JSON_GLIB_LIBRARIES json-glib-1.0)
-
-include (FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS (JSON_GLIB DEFAULT_MSG JSON_GLIB_LIBRARIES
-	JSON_GLIB_INCLUDE_DIR JSON_GLIB_INCLUDE_DIR_GOBJECT JSON_GLIB_INCLUDE_DIR_GLIBCONFIG)
-
-set (JSON_GLIB_INCLUDE_DIRS
-	${JSON_GLIB_INCLUDE_DIR}
-	${JSON_GLIB_INCLUDE_DIR_GOBJECT}
-	${JSON_GLIB_INCLUDE_DIR_GLIBCONFIG})
-
-unset (JSON_GLIB_INCLUDE_DIR CACHE)
-unset (JSON_GLIB_INCLUDE_DIR_GOBJECT CACHE)
-unset (JSON_GLIB_INCLUDE_DIR_GLIBCONFIG CACHE)
-mark_as_advanced (JSON_GLIB_LIBRARIES JSON_GLIB_INCLUDE_DIRS)
-
-- 
cgit v1.2.3