[poppler] cmake/modules

Albert Astals Cid aacid at kemper.freedesktop.org
Sun Jul 12 10:56:46 PDT 2009


 cmake/modules/FindGTK.cmake |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit d42b9425fb2f98fa79e7a60e4f71ef14f5bacfe9
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sun Jul 12 19:55:14 2009 +0200

    glade is not used anymore

diff --git a/cmake/modules/FindGTK.cmake b/cmake/modules/FindGTK.cmake
index b152c21..c751d3a 100644
--- a/cmake/modules/FindGTK.cmake
+++ b/cmake/modules/FindGTK.cmake
@@ -50,21 +50,20 @@ if (NOT WIN32)
   pkgconfig(gdk-pixbuf-2.0 _LibGDK2PixbufIncDir _LibGDK2PixbufLinkDir GDK2PixbufLinkFlags GDK2PixbufCflags)
   pkgconfig(gthread-2.0 _LibGThread2IncDir _LibGThread2LinkDir GThread2LinkFlags GThread2Cflags)
 
-  if (_LibGTK2IncDir AND _LibGDK2PixbufIncDir AND _LibGLADE2IncDir AND _LibGThread2IncDir)
-
+  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)
     if(_return_VALUE STREQUAL "0")
       set(_gtk_FOUND TRUE)
     endif(_return_VALUE STREQUAL "0")
 
     if (_gtk_FOUND)
-      set (GTK2_CFLAGS ${GTK2Cflags} ${GDK2PixbufCflags} ${GLADE2Cflags} ${GThread2Cflags})
-      set (GTK2_LIBRARIES ${GTK2LinkFlags} ${GDK2PixbufLinkFlags} ${GLADE2LinkFlags} ${GThread2LinkFlags})
+      set (GTK2_CFLAGS ${GTK2Cflags} ${GDK2PixbufCflags} ${GThread2Cflags})
+      set (GTK2_LIBRARIES ${GTK2LinkFlags} ${GDK2PixbufLinkFlags} ${GThread2LinkFlags})
     endif (_gtk_FOUND)
 
     find_package_handle_standard_args(GTK DEFAULT_MSG GTK2_LIBRARIES GTK2_CFLAGS)
 
-  endif (_LibGTK2IncDir AND _LibGDK2PixbufIncDir AND _LibGLADE2IncDir AND _LibGThread2IncDir)
+  endif (_LibGTK2IncDir AND _LibGDK2PixbufIncDir AND _LibGThread2IncDir)
 
 endif(NOT WIN32)
 


More information about the poppler mailing list