diff options
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | cmake/FindJsonGlib.cmake | 58 | ||||
| -rw-r--r-- | src/ld-document.c | 1 | ||||
| -rw-r--r-- | src/ld-library.c | 1 |
4 files changed, 65 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index aac2c9e..694b38a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,6 +55,9 @@ endif (WIN32) # Lua find_package (Lua51 REQUIRED) +# json-glib +find_package (JsonGlib REQUIRED) + # Localization find_package (Gettext) @@ -146,9 +149,9 @@ glib_genmarshal (${CMAKE_CURRENT_SOURCE_DIR}/src/ld-marshal g_cclosure_user_marshal) # Build the executable -include_directories (${GTK2_INCLUDE_DIRS} ${LUA_INCLUDE_DIR}) +include_directories (${GTK2_INCLUDE_DIRS} ${JSON_GLIB_INCLUDE_DIRS} ${LUA_INCLUDE_DIR}) add_executable (logdiag ${logdiag_SOURCES} ${logdiag_HEADERS}) -target_link_libraries (logdiag ${GTK2_LIBRARIES} ${LUA_LIBRARIES}) +target_link_libraries (logdiag ${GTK2_LIBRARIES} ${JSON_GLIB_LIBRARIES} ${LUA_LIBRARIES}) # Installation install (TARGETS logdiag DESTINATION bin) diff --git a/cmake/FindJsonGlib.cmake b/cmake/FindJsonGlib.cmake new file mode 100644 index 0000000..e07ac75 --- /dev/null +++ b/cmake/FindJsonGlib.cmake @@ -0,0 +1,58 @@ +# - 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) + +find_path (JSON_GLIB_INCLUDE_DIR_GLIBCONFIG glibconfig.h + PATHS /usr/lib + PATH_SUFFIXES 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) + diff --git a/src/ld-document.c b/src/ld-document.c index 64e1536..dbd367e 100644 --- a/src/ld-document.c +++ b/src/ld-document.c @@ -9,6 +9,7 @@ */ #include <gtk/gtk.h> +#include <json-glib/json-glib.h> #include "config.h" diff --git a/src/ld-library.c b/src/ld-library.c index de2a052..12e01ec 100644 --- a/src/ld-library.c +++ b/src/ld-library.c @@ -11,6 +11,7 @@ #include <string.h> #include <gtk/gtk.h> +#include <json-glib/json-glib.h> #include "config.h" |