cmake/modules/FindGTK.cmake | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 0480a788c0f25af1bc09360b599debb37f831e10
Author: Albert Astals Cid <[EMAIL PROTECTED]>
Date: Tue May 27 23:20:32 2008 +0200
require gthread-2.0
diff --git a/cmake/modules/FindGTK.cmake b/cmake/modules/FindGTK.cmake
index 0e90bd1..b934cf0 100644
--- a/cmake/modules/FindGTK.cmake
+++ b/cmake/modules/FindGTK.cmake
@@ -49,8 +49,9 @@ if (NOT WIN32)
pkgconfig(gtk+-2.0 _LibGTK2IncDir _LibGTK2LinkDir GTK2LinkFlags GTK2Cflags)
pkgconfig(gdk-pixbuf-2.0 _LibGDK2PixbufIncDir _LibGDK2PixbufLinkDir
GDK2PixbufLinkFlags GDK2PixbufCflags)
pkgconfig(libglade-2.0 _LibGLADE2IncDir _LibGLADE2LinkDir GLADE2LinkFlags
GLADE2Cflags)
+ pkgconfig(gthread-2.0 _LibGThread2IncDir _LibGThread2LinkDir
GThread2LinkFlags GThread2Cflags)
- if (_LibGTK2IncDir AND _LibGDK2PixbufIncDir AND _LibGLADE2IncDir)
+ if (_LibGTK2IncDir AND _LibGDK2PixbufIncDir AND _LibGLADE2IncDir AND
_LibGThread2IncDir)
exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=2.8.0 gtk+-2.0
RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull)
if(_return_VALUE STREQUAL "0")
@@ -58,13 +59,13 @@ if (NOT WIN32)
endif(_return_VALUE STREQUAL "0")
if (_gtk_FOUND)
- set (GTK2_CFLAGS ${GTK2Cflags} ${GDK2PixbufCflags} ${GLADE2Cflags})
- set (GTK2_LIBRARIES ${GTK2LinkFlags} ${GDK2PixbufLinkFlags}
${GLADE2LinkFlags})
+ set (GTK2_CFLAGS ${GTK2Cflags} ${GDK2PixbufCflags} ${GLADE2Cflags}
${GThread2Cflags})
+ set (GTK2_LIBRARIES ${GTK2LinkFlags} ${GDK2PixbufLinkFlags}
${GLADE2LinkFlags} ${GThread2LinkFlags})
endif (_gtk_FOUND)
find_package_handle_standard_args(GTK DEFAULT_MSG GTK2_LIBRARIES
GTK2_CFLAGS)
- endif (_LibGTK2IncDir AND _LibGDK2PixbufIncDir AND _LibGLADE2IncDir)
+ endif (_LibGTK2IncDir AND _LibGDK2PixbufIncDir AND _LibGLADE2IncDir AND
_LibGThread2IncDir)
endif(NOT WIN32)
_______________________________________________
poppler mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/poppler
