Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-22 Thread Graham Bloice
On 21 August 2014 13:24, Gisle Vanem gva...@yahoo.no wrote: Guy Harris g...@alum.mit.edu wrote: Presumably autotools can be convinced to generate ws_config.h rather than config.h. I'm not a user of auto* tools, but I guess it's done with: - AC_CONFIG_HEADERS(config.h)

[Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Guy Harris
alert_box.c 55c:\buildbot\wireshark\wireshark-master-64\win7x64\build\config.h(256): warning C4005: 'VERSION' : macro redefinition (..\..\..\ui\gtk\capture_dlg.c) [C:\buildbot\wireshark\wireshark-master-64\win7x64\build\cmbuild\ui\gtk\gtkui.vcxproj]

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Graham Bloice
On 21 August 2014 09:13, Guy Harris g...@alum.mit.edu wrote: alert_box.c 55c:\buildbot\wireshark\wireshark-master-64\win7x64\build\config.h(256): warning C4005: 'VERSION' : macro redefinition (..\..\..\ui\gtk\capture_dlg.c)

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Guy Harris
On Aug 21, 2014, at 1:57 AM, Graham Bloice graham.blo...@trihedral.com wrote: This obviously worked before the merge of ExtCap, so that has disturbed things. The CMake build should be using the generated one in the CMake build directory, i.e.

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Graham Bloice
On 21 August 2014 10:04, Guy Harris g...@alum.mit.edu wrote: On Aug 21, 2014, at 1:57 AM, Graham Bloice graham.blo...@trihedral.com wrote: This obviously worked before the merge of ExtCap, so that has disturbed things. The CMake build should be using the generated one in the CMake build

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Shanks, Graham (UK)
On 21 August 2014 10:31, Graham Bloice graham.blo...@trihedral.com wrote: [snip] I've always had the idea that angle bracket form was for system or platform includes and quoted form for project includes, but maybe I was just confused. Strictly speaking, according to the standard, both forms

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Roland Knall
The #include config.h statement is a mistake, it should refer to #include config.h I've committed a change to https://code.wireshark.org/review/#/c/3763/ . It builds find on my Linux and Mac (using GLib 2.36). Also looking at the Mac buildbot (GLib 2.34 is the issue) right now, and maybe have

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Shanks, Graham (UK)
On 21 August 2014 11:19, Roland Knall rkn...@gmain.com wrote: The #include config.h statement is a mistake, it should refer to #include config.h Relying on the difference between the quoted and angle brackets form to select the correct config.h file is fragile. A better solution would be to

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Shanks, Graham (UK)
I meant “Any reason why this shouldn’t be done?” Regards, Graham BAE Systems Integrated System Technologies Limited Registered Office: Warwick House, PO Box 87, Farnborough Aerospace Centre, Farnborough, Hants, GU14 6YU, UK Registered in England Wales No: 3456325

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Graham Bloice
On 21 August 2014 11:32, Shanks, Graham (UK) graham.sha...@baesystems.com wrote: I meant “Any reason why this shouldn’t be done?” The fragility was the source of my unease about simply using the angle bracket form. Originally I thought moving config.h would lead to a lot of other

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Graham Bloice
On 21 August 2014 11:19, Roland Knall rkn...@gmail.com wrote: The #include config.h statement is a mistake, it should refer to #include config.h I've committed a change to https://code.wireshark.org/review/#/c/3763/ . It builds find on my Linux and Mac (using GLib 2.36). Also looking at

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Gisle Vanem
Shanks, Graham (UK) graham.sha...@baesystems.com wrote: A better solution would be to move the local config.h into a subdirectory and then use the following: #include “subdir/config.h” Since several dependent packages could have a config.h in it's ./include dir, (shadowing for Wireshark's

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Guy Harris
On Aug 21, 2014, at 4:20 AM, Gisle Vanem gva...@yahoo.no wrote: Shanks, Graham (UK) graham.sha...@baesystems.com wrote: A better solution would be to move the local config.h into a subdirectory and then use the following: #include “subdir/config.h” Since several dependent packages

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Gisle Vanem
Guy Harris g...@alum.mit.edu wrote: Presumably autotools can be convinced to generate ws_config.h rather than config.h. I'm not a user of auto* tools, but I guess it's done with: - AC_CONFIG_HEADERS(config.h) +AC_CONFIG_HEADERS(ws_config.h) --gv