From adead30747b398ea52abe6286c12164870816f2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=99emysl=20Janouch?= <p.janouch@gmail.com>
Date: Tue, 20 Jan 2015 07:40:46 +0100
Subject: [PATCH] Fix Debian build

---
 CMakeLists.txt           | 2 +-
 cmake/FindJsonGlib.cmake | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b01a60..a849450 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -245,7 +245,7 @@ set_target_properties (liblogdiag PROPERTIES OUTPUT_NAME logdiag)
 
 # Build the executable
 add_executable (logdiag WIN32 ${logdiag_SOURCES} ${logdiag_HEADERS})
-target_link_libraries (logdiag liblogdiag ${logdiag_LIBS})
+target_link_libraries (logdiag liblogdiag m ${logdiag_LIBS})
 
 # Testing
 option (BUILD_TESTING "Build tests" OFF)
diff --git a/cmake/FindJsonGlib.cmake b/cmake/FindJsonGlib.cmake
index ab19c10..c279de1 100644
--- a/cmake/FindJsonGlib.cmake
+++ b/cmake/FindJsonGlib.cmake
@@ -36,8 +36,12 @@ find_path (JSON_GLIB_INCLUDE_DIR json-glib/json-glib.h
 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 /usr/lib
+	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)