p
/
logdiag
1
1
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity

Use pkg-config for json-glib-1.0

This commit is contained in:
Přemysl Eric Janouch 2016-03-15 22:12:14 +01:00
parent 7a3ceb5435
commit b552b3cae9
2 changed files with 1 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -78,9 +78,8 @@ if (CONVERT_EXECUTABLE AND NOT WIN32)
endif (CONVERT_EXECUTABLE AND NOT WIN32) endif (CONVERT_EXECUTABLE AND NOT WIN32)
# Dependencies # Dependencies
find_package (JsonGlib REQUIRED)
find_package (PkgConfig 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) if (NOT WIN32)
pkg_search_module (Lua52 REQUIRED lua5.2 lua-5.2 lua>=5.2) pkg_search_module (Lua52 REQUIRED lua5.2 lua-5.2 lua>=5.2)

62
cmake/FindJsonGlib.cmake
View File

@ -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)