From 78a4bc737e9ba029024418bb4a4d8f7f61d69b42 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 27 Feb 2015 23:37:35 +0100 Subject: [PATCH] Look for gio when searching for libsoup with CMake. --- cmake/FindSoup.cmake | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/cmake/FindSoup.cmake b/cmake/FindSoup.cmake index 82735a317..a3951e7f0 100644 --- a/cmake/FindSoup.cmake +++ b/cmake/FindSoup.cmake @@ -40,8 +40,16 @@ find_path(SOUP_INCLUDE_DIRS ) if(SOUP_INCLUDE_DIRS) - set(HAVE_LIBSOUP_SOUP_H 1) - list(APPEND SOUP_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS}) + find_path(GIO_INCLUDE_DIRS + NAMES gio/gio.h + HINTS _SOUP_ROOT_PATHS + PATH_SUFFIXES include/glib-2.0 + ) + + if(GIO_INCLUDE_DIRS) + set(HAVE_LIBSOUP_SOUP_H 1) + list(APPEND SOUP_INCLUDE_DIRS ${GIO_INCLUDE_DIRS} ${GTK2_INCLUDE_DIRS}) + endif() endif() find_library(SOUP_LIBRARIES @@ -51,7 +59,15 @@ find_library(SOUP_LIBRARIES ) if(SOUP_LIBRARIES) - list(APPEND SOUP_LIBRARIES ${GTK2_LIBRARIES}) + find_library(GIO_LIBRARIES + NAMES gio-2.0 + HINTS ${_SOUP_ROOT_PATHS} + PATH_SUFFIXES bin lib + ) + + if(GIO_LIBRARIES) + list(APPEND SOUP_LIBRARIES ${GIO_LIBRARIES} ${GTK2_LIBRARIES}) + endif() endif() include(FindPackageHandleStandardArgs)