cmake/modules/FindGLIB.cmake | 3 ++- cmake/modules/FindGTK.cmake | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
New commits: commit 13ee9f8b7d42ed7d7bc0f9dbf190ff66e6ab5a81 Author: Pino Toscano <[email protected]> Date: Mon Mar 18 18:15:57 2013 +0100 cmake: drop search of gthread-2.0 and gio-2.0 from GTK this matches what is done in the autoconf counterpart diff --git a/cmake/modules/FindGTK.cmake b/cmake/modules/FindGTK.cmake index 1a32483..cb67220 100644 --- a/cmake/modules/FindGTK.cmake +++ b/cmake/modules/FindGTK.cmake @@ -15,7 +15,7 @@ include(FindPackageHandleStandardArgs) if (NOT WIN32) find_package(PkgConfig REQUIRED) - pkg_check_modules(GTK3 "gtk+-3.0>=3.0" "gdk-pixbuf-2.0" "gthread-2.0" "gio-2.0") + pkg_check_modules(GTK3 "gtk+-3.0>=3.0" "gdk-pixbuf-2.0") find_package_handle_standard_args(GTK DEFAULT_MSG GTK3_LIBRARIES GTK3_CFLAGS) commit 47e869e60fb147caca825380eeaa2a0851d502b9 Author: Michael Weiser <[email protected]> Date: Mon Mar 18 18:15:14 2013 +0100 cmake: search also for gio-2.0 as GLIB library diff --git a/cmake/modules/FindGLIB.cmake b/cmake/modules/FindGLIB.cmake index 15fb0c7..35a9f9e 100644 --- a/cmake/modules/FindGLIB.cmake +++ b/cmake/modules/FindGLIB.cmake @@ -6,6 +6,7 @@ # GLIB2_LIBRARIES - Link these to use GLib # # Copyright 2008-2010 Pino Toscano, <[email protected]> +# Copyright 2013 Michael Weiser, <[email protected]> # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -15,7 +16,7 @@ include(FindPackageHandleStandardArgs) if (NOT WIN32) find_package(PkgConfig REQUIRED) - pkg_check_modules(GLIB2 "glib-2.0>=${GLIB_REQUIRED}" "gobject-2.0>=${GLIB_REQUIRED}") + pkg_check_modules(GLIB2 "glib-2.0>=${GLIB_REQUIRED}" "gobject-2.0>=${GLIB_REQUIRED}" "gio-2.0>=${GLIB_REQUIRED}") find_package_handle_standard_args(GLib DEFAULT_MSG GLIB2_LIBRARIES GLIB2_CFLAGS) _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
