Hello,

I've just noticed WTHTTP_WITH_ZLIB is defined in
wt/src/http/CMakeLists.txt by means of ADD_DEFINITIONS if
HTTP_WITH_ZLIB is defined.

Either ignore my patch and live with WConfig.h always having
WTHTTP_WITH_ZLIB undefined, or remove -DWTHTTP_WITH_ZLIB in
wt/src/http/CMakeLists.txt.

On Fri, Jan 1, 2010 at 2:48 PM, Pau Garcia i Quiles
<[email protected]> wrote:
> Hello,
>
> Happy New Year! Sending to the list because Redmine is down.
>
> WConfig.h never defines WTHTTP_WITH_ZLIB, even when libwthttp *is*
> being built with zlib support, due to a trivial mistake (typo?) in
> src/http/CMakeLists.txt: WConfig.h.in looks for variable
> WTHTTP_WITH_ZLIB but the CMakeLists.txt defines OPTION( HTTP_WITH_ZLIB
> ... ).
>
> The ideal solution would be to rename the variable in
> OPTION(HTTP_WITH_ZLIB...) to OPTION( WTHTTP_WITH_ZLIB, or in
> WConfig.h.in (WTHTTP_WITH_ZLIB -> HTTP_WITH_ZLIB) but that may break
> existing build configurations. To avoid breaking anything, the
> attached patch performs the trivial, redundant action: if
> HTTP_WITH_ZLIB is true, then set WTHTTP_WITH_ZLIB true, too.
>
> The patch is a bit more complex than that because:
> 1. CONFIGURE_FILE( WConfig.h.in ...), which needs WTHTTP_WITH_ZLIB, is
> in wt/CMakeLists.txt
> 2. But OPTION(HTTP_WITH_ZLIB) and SET( WTHTTP_WITH_ZLIB) are in
> wt/src/http/CMakeLists.txt
> 3. And you are using SUBDIRS() instead of ADD_SUBDIRECTORY() to add
> 'src', which in turn uses SUBDIRS() again to add 'http'
>
> SUBDIRS() *always* takes effect at the end of the CMakeLists.txt, no
> matter where it is added, which meant HTTP_WITH_ZLIB (and therefore
> WTHTTP_WITH_ZLIB had I submitted the very trivial path adding SET(
> WTHTTP_WITH_ZLIB 1 ) ) would always be false. Since changing SUBDIRS
> to ADD_SUBDIRECTORY does not work without quite some effort in this
> case because of circular dependencies, therefore I opted for the
> simplest solution: move OPTION( HTTP_WITH_ZLIB ...) from
> wt/src/http/CMakeLists.txt to the main CMakeLists.txt
>
> Summary: please apply the attached patch :-)
>
> --
> Pau Garcia i Quiles
> http://www.elpauer.org
> (Due to my workload, I may need 10 days to answer)
>



-- 
Pau Garcia i Quiles
http://www.elpauer.org
(Due to my workload, I may need 10 days to answer)

------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev 
_______________________________________________
witty-interest mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/witty-interest

Reply via email to