Review Request 117309: Fix build without X11

[Michael Palimaka]

> On April 2, 2014, 12:47 a.m., Aleix Pol Gonzalez wrote:
> > If it wasn't found, it should be false. Why's that wrong?

The way it currently evaluates, if X11 is not found, config-ksysguard.h contains "#define HAVE_X11". This is then substituted resulting in literal "#if ", which fails to build because nothing is obviously not a valid condition. This change ensures that HAVE_X11 is set to 0 if X11 is not found.

This approach is borrowed from frameworks. You can verify the problem by building with -DCMAKE_DISABLE_FIND_PACKAGE_X11=true.


- Michael


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/117309/#review54831
-----------------------------------------------------------


On April 1, 2014, 5:54 p.m., Michael Palimaka wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/117309/
> -----------------------------------------------------------
> 
> (Updated April 1, 2014, 5:54 p.m.)
> 
> 
> Review request for Plasma.
> 
> 
> Repository: libksysguard
> 
> 
> Description
> -------
> 
> If X11 was not found, HAVE_X11 would be unset resulting in literal "#if ".
> 
> 
> Diffs
> -----
> 
>   CMakeLists.txt 4d3a76eb7f041d45ef545f817a39db8e8080ce9e 
>   config-ksysguard.h.cmake 9928bc16cf0de32f6b051e7746ae77cbb2d35991 
> 
> Diff: https://git.reviewboard.kde.org/r/117309/diff/
> 
> 
> Testing
> -------
> 
> Builds and tests pass both with and without X11.
> 
> 
> Thanks,
> 
> Michael Palimaka
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20140402/882a31da/attachment.html>