Wireshark · Wireshark-dev: Re: [Wireshark-dev] FindGTK2.cmake /trunk/: CMakeLists.txt

[Joerg Mayer <jmayer@xxxxxxxxx>]

On Sun, Mar 07, 2010 at 10:42:46PM +0100, Stig Bj?rlykke wrote:
> On 7. mars 2010, at 22.36, Joerg Mayer wrote:
> 
> > So which other change do we need to make this work on  OS X?
> 
> It works for me with this patch, but I haven't tested on other platforms yet.

I used a different version of the patch


Index: cmake/modules/FindGTK2.cmake
===================================================================
--- cmake/modules/FindGTK2.cmake	(revision 32138)
+++ cmake/modules/FindGTK2.cmake	(working copy)
@@ -419,9 +419,9 @@
         _GTK2_FIND_INCLUDE_DIR(GTK2_ATK_INCLUDE_DIR atk/atk.h)
         _GTK2_FIND_LIBRARY    (GTK2_ATK_LIBRARY atk false true)
 
-        #elseif(_GTK2_component STREQUAL "gdk_pixbuf")
-        #_GTK2_FIND_INCLUDE_DIR(GTK2_GDKPIXBUF_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h)
-        #_GTK2_FIND_LIBRARY    (GTK2_GDKPIXBUF_LIBRARY gdk_pixbuf false true)
+    elseif(_GTK2_component STREQUAL "gdk_pixbuf")
+        _GTK2_FIND_INCLUDE_DIR(GTK2_GDKPIXBUF_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h)
+        _GTK2_FIND_LIBRARY    (GTK2_GDKPIXBUF_LIBRARY gdk_pixbuf false true)
 
     elseif(_GTK2_component STREQUAL "gtkmm")
 
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 32139)
+++ CMakeLists.txt	(working copy)
@@ -234,7 +237,7 @@
 #Build the gui ?
 if(BUILD_wireshark)
 	set(PACKAGELIST GTK2 ${PACKAGELIST})
-	set(GTK2_OPTIONS COMPONENTS gtk)
+	set(GTK2_OPTIONS COMPONENTS gtk gdk_pixbuf)
 	set(GTK2_DEBUG false)
 endif()
 
and ran into some problems (os 11.2)

Using your version of the patch seems to work (still waiting for the compile to finish,
but it's way past the place where it failed last time).

So go ahead and commit.

Ciao
 Joerg
-- 
Joerg Mayer                                           <jmayer@xxxxxxxxx>
We are stuck with technology when what we really want is just stuff that
works. Some say that should read Microsoft instead of technology.