On Monday 17 November 2014 10:49:23 Brad King wrote:
> On 11/14/2014 05:32 PM, Peter Wu wrote:
> > Based on recent configure patches:
> >
> > eda919f configure: Added krb5 to the supported features
> > f0d860d configure: Fixed NTLM missing from features when CURL_DISABLE_HTTP defined
> > fe0f896 configure: assume krb5 when gss-api works
> > 676d62f configure: Fixed inclusion of krb5 when CURL_DISABLE_CRYPTO_AUTH is defined
> >
> > Signed-off-by: Peter Wu <peter_at_lekensteyn.nl>
>
> +1

Thanks!

> This just updates the CMake logic to match what configure is now doing.

Since two days ago, "krb5" needs to be renamed by "Kerberos" following:

    a4b7f71 tool: Use Kerberos for supported feature

Daniel, could you add this to the commit message when applying, and rename the
symbol or do you want me to spin a new patch?

> > Daniel recently asked for one or more acks on CMake patches, but I do
> > not know whether this patch needs that too as it is a logical change
> > with no need for CMake domain knowledge.
>
> Peter, please take a look at my patch for CMP0054 warnings:
>
> CMake: Simplify if() conditions on check result variables
> http://thread.gmane.org/gmane.comp.web.curl.library/44245

That patch looks OK to me!

> Also I noticed your comment added in this commit:
>
> 2a2bb78cce (cmake: add SUPPORT_FEATURES and SUPPORT_PROTOCOLS, 2014-10-14)
>
> > +function(_add_if label)
> > + # TODO need to disable policy CMP0054 (CMake 3.1) to allow this indirection
> > + if(${ARGN})
>
> I see no CMP0054 warnings from that indirection. All arguments expanded
> from ${ARGN} will be unquoted and CMP0054 only warns about quoted args.
> Can you provide an example?

I was told in #cmake that constructs such as `if(${ARGN})` are deprecated in
favor of `if(ARGN)`, but the `${ARGN}` indirection is really needed here. That
is where the comment comes from, I do not remember seeing this warning raised
while running cmake though.

-- 
Kind regards,
Peter
https://lekensteyn.nl
-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette:  http://curl.haxx.se/mail/etiquette.html