cmake/modules/FindGTK.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit 30e5f76e372114339fa1d37c335e6bbade8b6d8a Author: Pino Toscano <[email protected]> Date: Thu Jan 7 11:18:36 2010 +0100 [CMake] followup recent glib/gtk+ version requirements - glib to 2.18, see ce9404b1999f81b3f9e5a89bcd6e715463f89024 - gtk+ to 2.14, see e338643f2cebb1203f7ff0646f87b3dea8318757 diff --git a/cmake/modules/FindGTK.cmake b/cmake/modules/FindGTK.cmake index c751d3a..0ec29f0 100644 --- a/cmake/modules/FindGTK.cmake +++ b/cmake/modules/FindGTK.cmake @@ -20,14 +20,14 @@ if (NOT WIN32) set (GLIB_FOUND FALSE) if (_LibGLIB2IncDir) - exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=2.6 glib-2.0 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull) + exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=2.18 glib-2.0 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull) if(_return_VALUE STREQUAL "0") set(_glib_FOUND TRUE) endif(_return_VALUE STREQUAL "0") endif (_LibGLIB2IncDir) if (_LibGDK2IncDir) - exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=2.4.0 gdk-2.0 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull) + exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=2.14 gdk-2.0 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull) if(_return_VALUE STREQUAL "0") set(_gdk_FOUND TRUE) endif(_return_VALUE STREQUAL "0") @@ -51,7 +51,7 @@ if (NOT WIN32) pkgconfig(gthread-2.0 _LibGThread2IncDir _LibGThread2LinkDir GThread2LinkFlags GThread2Cflags) if (_LibGTK2IncDir AND _LibGDK2PixbufIncDir AND _LibGThread2IncDir) - exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=2.8.0 gtk+-2.0 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull) + exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=2.14 gtk+-2.0 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull) if(_return_VALUE STREQUAL "0") set(_gtk_FOUND TRUE) endif(_return_VALUE STREQUAL "0") _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
