Review Request 120746: Fix build of keyboards kcm on debian-based systems

[Martin Klapetek]

> On Oct. 23, 2014, 12:34 p.m., Martin Gräßlin wrote:
> > CMakeLists.txt, line 100
> > <https://git.reviewboard.kde.org/r/120746/diff/1/?file=321760#file321760line100>
> >
> >     what's the thought behind makeing it an optional dependency?

The xinput.h is used only in the keyboard kcm, that is build only if the XKB is found. So I just followed the same path.


> On Oct. 23, 2014, 12:34 p.m., Martin Gräßlin wrote:
> > kcms/keyboard/CMakeLists.txt, lines 13-15
> > <https://git.reviewboard.kde.org/r/120746/diff/1/?file=321761#file321761line13>
> >
> >     wouldn't it be better to use a config-foo.h file?

Maybe, I just (again) did the same that already exists there (the "if (X11_Xinput_FOUND...") to keep things consistent


- Martin


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


On Oct. 23, 2014, 12:08 p.m., Martin Klapetek wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/120746/
> -----------------------------------------------------------
> 
> (Updated Oct. 23, 2014, 12:08 p.m.)
> 
> 
> Review request for Plasma.
> 
> 
> Repository: plasma-desktop
> 
> 
> Description
> -------
> 
> e5741584 reintroduced xcb xinput code and added a "#include <xcb/xinput.h>" without properly looking for xinput in cmake (and was placed in wrong ifdef).
> 
> This makes cmake look for xcb xinput and properly ifdef the code if xcb/xinput.h is not found; for example debian-based systems ship xcb without xinput altogether.
> 
> 
> Diffs
> -----
> 
>   CMakeLists.txt 7e2ccd6 
>   kcms/keyboard/CMakeLists.txt f05be16 
>   kcms/keyboard/xinput_helper.cpp f15fbdf 
> 
> Diff: https://git.reviewboard.kde.org/r/120746/diff/
> 
> 
> Testing
> -------
> 
> Everything built fine.
> 
> 
> Thanks,
> 
> Martin Klapetek
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20141023/d054acd2/attachment-0001.html>