Review Request 115343: Fix msvc build of solid

[Alex Merry]

> On Jan. 31, 2014, 7:41 p.m., Alex Merry wrote:
> > src/solid/networking_win.cpp, lines 116-117
> > <https://git.reviewboard.kde.org/r/115343/diff/1/?file=240767#file240767line116>
> >
> >     It's odd that this should be needed.  Do you have any way of getting verbose output?  (http://www.cmake.org/Wiki/CMake_FAQ#Is_there_an_option_to_produce_more_.27verbose.27_compiling.3F)
> >     
> >     I get a bunch of "AUTOMOC: Checking [path to file]" messages when I do that, and this list includes networking.cpp and (later on) networking.h and networking_p.h
> 
> Alexander Richardson wrote:
>     Here it gives me:
>     
>     AUTOGEN: Checking C:/kf5/source/frameworks/solid/src/solid/networking_win.cpp
>     
>     but no mention of networking.h or networking_p.h unless I add the moc include.
>     These headers are included by networking_win.cpp, so I guess they should also be checked by automoc.
>     Not sure if this is intended behaviour or a cmake bug

So... CMake doesn't actually check "all header files" as the documentation claims.  For every source file, <file>.cpp, it checks <file>.h and <file>_p.h.  The upshot is that these includes are needed.  Can you put a comment to that effect above the includes?  I've sent a patch to the cmake-developers list with a suggested CMake documentation fix.


- Alex


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


On Jan. 27, 2014, 9:29 p.m., Alexander Richardson wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/115343/
> -----------------------------------------------------------
> 
> (Updated Jan. 27, 2014, 9:29 p.m.)
> 
> 
> Review request for KDE Frameworks.
> 
> 
> Repository: solid
> 
> 
> Description
> -------
> 
> 1) Fix linking on windows
> 
> For some reason automoc does not pick up these files, have to explicitly
> include moc_networking(_p).cpp
> 
> -------------------------------------------------------------------------------
> 
> 2) Fix compilation on windows by including qt_windows.h
> 
> This file makes sure that NOMINMAX is defined so the build can succeed
> 
> 
> Diffs
> -----
> 
>   autotests/solidhwtest.cpp 0e3fa05351f27165eb443e90324abacf911a8b0d 
>   src/solid/backends/win/windevicemanager.h b73ccfcd0588fe39e2a32cde501119ca3877f552 
>   src/solid/backends/win/winstoragedrive.cpp 357699fc1d0f7cca1d7e68e0a2a9f875288e5453 
>   src/solid/backends/win/winstoragevolume.cpp eae68af57dca253d962d9802d6a9a876cb563b72 
>   src/solid/backends/wmi/wmiquery.h 8f3f0a458ad517153a0a76a812175346e84452fa 
>   src/solid/networking_win.cpp 62ebacbe8b3ee421bf8e404d72dba4619c2a7e73 
> 
> Diff: https://git.reviewboard.kde.org/r/115343/diff/
> 
> 
> Testing
> -------
> 
> compiles now, didn't before
> 
> 
> Thanks,
> 
> Alexander Richardson
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20140203/69101ec5/attachment.html>