Wireshark-dev: Re: [Wireshark-dev] [Wireshark-commits] rev 38345: /trunk/ /trunk/: CMakeLists.t
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Joerg Mayer <jmayer@xxxxxxxxx>
Date: Fri, 5 Aug 2011 02:45:09 +0200
On Fri, Aug 05, 2011 at 12:25:08AM +0000, gerald@xxxxxxxxxxxxx wrote:
> http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=38345
> 
> User: gerald
> Date: 2011/08/04 05:25 PM
> 
> Log:
>  Use GLIB2_LDFLAGS instead of GLIB2_LIBRARIES for wsutil, since it
>  includes the path to the libraries. Add gthread to wireshark_LIBS if
>  threads are enabled.
> 
> Directory: /trunk/
>   Changes    Path              Action
>   +6 -0      CMakeLists.txt    Modified

if(ENABLE_THREADS)
   set(wireshark_LIBS ${wireshark_LIBS} ${GTHREAD2_LIBRARIES})
endif()

Why the conditional? If ENABLE_THREADS is not set, then GTHREAD2_LIBRARIES
should be empty.

> Directory: /trunk/wsutil/
>   Changes    Path              Action
>   +1 -1      CMakeLists.txt    Modified

GLIB2_LIBRARIES -> GLIB2_LDFLAGS

Is this really the correct place or should this be fixed in FindGLIB2 instead?

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.