Commit Graph

188 Commits

Author SHA1 Message Date
Guy Harris dbd409d041 Fix OS X CMake build.
I have ***NO*** idea why this makes a difference, but, without this
change, APPLE_CORE_FOUNDATION_LIBRARY is apparently *not* set correctly
for wsutil/CMakeLists.txt, and, with this change, it is.  I guess
there's something magic involved here with "global" CMake variables or
something crazy such as that.

Change-Id: I7a0046b9c249568cd666720838104f48e854e203
Reviewed-on: https://code.wireshark.org/review/2612
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24 07:10:12 +00:00
Guy Harris 5e5e2019ee Another message from Clang for unknown -f and -m flags.
For -f and -m flags that don't apply to the target architecture(?),
Clang doesn't fail but does print a warning "argument unused during
compilation: '-{flag}'".  Catch that and treat it as a failure
indication, so we don't use that flag.

Change-Id: I65948ada41fa44fb62f9a2b8b320f137a5902b8f
Reviewed-on: https://code.wireshark.org/review/2399
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 18:46:09 +00:00
Joerg Mayer 7939f6888b Don't put c-comments into cmake files. Won't work at midnight either.
Change-Id: I80efce78a044f477af56f82cc9d8e85c8544ffbc
Reviewed-on: https://code.wireshark.org/review/2372
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18 07:30:43 +00:00
Joerg Mayer 544066530b Fix building uiqt on Windows with the cmake build system:
Protecting HAVE_PCAP_CREATE was not enough for the moc run in qt,
maybe it doesn't have _WIN32 set?  Don't even try to detect this
function on WIN32 for now.

Change-Id: I0d8a8b5b110cec164f86fe11f26a7add558eee1b
Reviewed-on: https://code.wireshark.org/review/2370
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18 06:54:52 +00:00
Joerg Mayer f847b92b08 It's so simple: If we require a package but provide alternative methods
of finding the package don't allow the first method to fail terminally.
Todo: Fix this in all other places as well.

Change-Id: I5a343fac33f6a5d6e50ff353d739459b2e36711a
Reviewed-on: https://code.wireshark.org/review/2300
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-17 14:29:52 +00:00
Joerg Mayer caf5e59001 Undo Graham's change to find the "correct" fix
Change-Id: Ifc368687da972231298ab5935d071a84edd3e56e
Reviewed-on: https://code.wireshark.org/review/2261
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-16 18:52:12 +00:00
Joerg Mayer c62d6e5753 Undo Graham's change to move find-package down.
Fix detection of Homebrew on APPLE

Change-Id: I96506bb57d4772c5c90b1117c37e8350cda376ee
Reviewed-on: https://code.wireshark.org/review/2257
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-16 18:43:45 +00:00
Joerg Mayer 66532894b0 Detecting gmodule2 on Homebrew almost worked... it behaves more like
non-apple platforms

Change-Id: I1acf8d05c918121fe1a76c8fbd3ac119f624ee8b
Reviewed-on: https://code.wireshark.org/review/2256
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-16 18:32:26 +00:00
Graham Bloice 561460160a Update CMake build for win32 to build QT again, and to find
GLib and GThread libs

Change-Id: If7e8ebc46f42389d174959303e13cde20687ae8a
Reviewed-on: https://code.wireshark.org/review/2010
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-08 12:13:35 +00:00
Pascal Quantin ad7b5381ac Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0
Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4
Reviewed-on: https://code.wireshark.org/review/1978
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06 15:33:01 +00:00
Joerg Mayer 95b694fc94 Fix message about detection of asciidoc package (would always report
not found before).

Change-Id: Iaac974e5db3e605e0b9f7256d2724ae777eaebc3
Reviewed-on: https://code.wireshark.org/review/1963
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-04 22:12:56 +00:00
Michal Labedzki aff380770a cmake: Not all system have HtmlViewer
Not all system have HtmlViewer, but we support that case
by inform user about file/website, so we "have" HtmlViewer.

Change-Id: I46e16a86b5c7f9dd47e1d1ded9d10fd4f565660f
Reviewed-on: https://code.wireshark.org/review/1875
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-30 12:47:12 +00:00
Alexis La Goutte 5ff629ec5a CMake: Remove FeatureSummary.cmake and fix display of feature
Bug:8819

Change-Id: I35778a4ce198245fbe86eaded2b733745ff8e934
Reviewed-on: https://code.wireshark.org/review/1728
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-27 11:20:55 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
Alexis La Goutte 94a791a76e Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\$Id\$/,+1 d') (No space or star before $Id$)

Change-Id: I0801bd7cf234d32487008a8b6dcee64875b07688
Reviewed-on: https://code.wireshark.org/review/876
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-31 16:00:04 +00:00
Joerg Mayer fa7288702a Fix GTK3 detection (or more specific: the include paths) on Windows
Change-Id: Ia0aef096849d1935ca4a6d1d31aabd099087cf29
Reviewed-on: https://code.wireshark.org/review/694
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-03-16 11:42:32 +00:00
Michal Labedzki 5e27a39fc6 Add Bluetooth SBC Codec support in cmake
SBC Codec can be optionally linked with Wireshark to provide
ability to playing RTP/SBC stream by RTP Player.

Change-Id: Iffbae16a741ffbfd0fb55a300064739d2c27c2e5
Reviewed-on: https://code.wireshark.org/review/223
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-17 21:44:17 +00:00
Gerald Combs 5e3113e7c9 Finish converting the Developer's Guide to AsciiDoc.
Add developer-guide-docinfo.xml, which lets us carry over DocBook front
matter. Remove the meta_info chapter. Most of its contents are now in
developer-guide-docinfo.xml. Add a DocBook revision history based on
hints from the Git/SVN/CVS revision history.

Comment out or note makefile content that's no longer necessary for
converting the Developer's Guide but will be useful for converting the
User's Guide. Fix building the release notes with CMake. Other minor
changes. Tested with Autotools, nmake, and CMake.

Change-Id: Ib6d50c821ca906fff50a84ad4d6af3212ebdff0a
Reviewed-on: https://code.wireshark.org/review/155
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
2014-02-11 18:04:45 +00:00
Gerald Combs c57ac03e65 Try to get CMake to build the Developer Guide again. I don't have
dblatex installed so the release notes fail to build but the WSDG
targets appear to work.

svn path=/trunk/; revision=54952
2014-01-25 00:17:19 +00:00
Gerald Combs a9ddc06adc Prepare for conversion of Guide chapters to AsciiDoc.
svn path=/trunk/; revision=54936
2014-01-24 01:10:10 +00:00
Jörg Mayer 2a21b01fbb Add option to specify special permissions for dumpcap during cmake phase:
set(DUMPCAP_INSTALL_OPTION   <val>)
where val is one of "normal" "suid" "capabilities"

Some things left to do:
- Error out in cmake if setcap isn't found or libcap isn't found.
- Move multivalue option handling into it's own macro (-file) with
  value checking


svn path=/trunk/; revision=54840
2014-01-19 00:48:22 +00:00
Gerald Combs fae3157f04 Look for win_flex and win_bison.
svn path=/trunk/; revision=54830
2014-01-16 20:15:20 +00:00
Gerald Combs 8db4bc2499 More Chocolatey lex/yacc updates.
Add Windows-style path handling to runlex.sh. Update the example
Chocolatey LEX path accordingly. This lets us use path information in
LEX and have it work in both nmake and runlex.sh

Add a FindChocolatey.cmake module. Update FindLEX and FindYACC to use it.
The code is currently untested and commented out.

svn path=/trunk/; revision=54828
2014-01-16 18:57:29 +00:00
Jörg Mayer 6d17d3c4d6 Beginnings of doxygen support.
Currently the doxygen.cfg files are not designed for
out-of-tree builds - that needs to be fixed first.

svn path=/trunk/; revision=54348
2013-12-22 01:21:56 +00:00
Jörg Mayer b2be51c76d Only try to fix absolute Unix paths.
svn path=/trunk/; revision=53801
2013-12-05 22:50:42 +00:00
Jörg Mayer 70f4223c2a The changes to work around the msbuild deficiencies broke
dependeny tracking (replaced the list of dissectors by the file
containing the dissectors). Fix that.

svn path=/trunk/; revision=53703
2013-12-01 22:24:59 +00:00
Jörg Mayer c0f974f9d1 Too litte modify in copy - modify - paste cycle
svn path=/trunk/; revision=53693
2013-12-01 10:58:17 +00:00
Jörg Mayer 38b8e4ecb9 Graham Bloice
- Using gtk[23] is a hack. Implement a clean solution.

Me
- In the current setup, building Qt ONLY is not supported as
  lots of required support libraries are only found in gtk2 and
  gtk3. Print an error in that case.
- Small style changes (lowercasing, whitespace)

svn path=/trunk/; revision=53692
2013-12-01 10:34:01 +00:00
Jörg Mayer fb22ecce8d Graham Bloice
I've now got tshark to build from a VS solution file, had to do some hacks
to get there though, patch files attached for others to peruse, as I'm not
sure if they are the optimal solutions:

   3. As mentioned in my previous message, the VS solution chops out every
   8192nd byte from the command line passed to make-dissector-reg.py.  My
   patch (make-reg.patch) gets CMake to write out the required source file
   list to a file and modifies the python script to read in the file.  The
   python changes *should* be backwards compatible.

Me: Small fix to UseMakeDissectorReg.cmake (elseif() -> else())

svn path=/trunk/; revision=53654
2013-11-29 19:57:00 +00:00
Jörg Mayer d2fc0179cc - Avoid copying of the graphics, specify the graphics source
dir instead.
- (Finally!) fix the problem of missing admon graphics in out of
  tree builds - specify the admin directory as an absolute path
  This may need porting to Makefile.am

svn path=/trunk/; revision=53618
2013-11-27 23:07:25 +00:00
Graham Bloice e36f3b0526 Ensure the WIRESHARK_BASE_DIR env var is in cmake format. Required for the regex in FindGTK3.cmake.
svn path=/trunk/; revision=53550
2013-11-24 19:12:07 +00:00
Jörg Mayer 2276ff07d2 Beginnings of CheckAPI support. More diligence needed
(need to seperate generated files into their own variables).

svn path=/trunk/; revision=53407
2013-11-18 07:42:23 +00:00
Jörg Mayer 086e73cf7d On Windows find the standard html viewer by using bigger and bigger
hammers only to realize that this really needs to be done at runtime.
Commit it anyway.

svn path=/trunk/; revision=53226
2013-11-10 14:42:49 +00:00
Jörg Mayer da01960a24 Make FindGTK3 work on windows
svn path=/trunk/; revision=53218
2013-11-10 11:00:54 +00:00
Jörg Mayer ee0d4f698d Try to get findhtmlviewer working on windows. Doesn't work but
at least remember the registry keys for the next time someone
works on this.

svn path=/trunk/; revision=53215
2013-11-10 10:38:49 +00:00
Jörg Mayer fa3332e8ed Remove extraction of cmake parameters from autotools files.
While it was an interesting exercise it just doesn't
work good enough to stay, i.e. it doesn't automatically
pick up changes but requires rerunning cmake instead.

svn path=/trunk/; revision=53149
2013-11-07 21:40:31 +00:00
Jörg Mayer 117a59d7a2 Pass the name of the sed executable as an explicit argurment to
runlex.sh (like it is done with LEX already). May fix a problem
on Windows with cmake.

svn path=/trunk/; revision=53059
2013-11-03 12:22:39 +00:00
Jörg Mayer ec34959796 Add generation of release notes.
Regenerate NEWS file

svn path=/trunk/; revision=53014
2013-11-01 09:55:26 +00:00
Jörg Mayer 9bdeb99606 Remove a comment about adding use of the sh version of the script.
svn path=/trunk/; revision=53013
2013-11-01 09:54:05 +00:00
Jörg Mayer 8a7198a711 Fix a typo that was never noticed
svn path=/trunk/; revision=53012
2013-11-01 09:53:17 +00:00
Jeff Morriss 0690c4f490 More SVN properties cleanup.
svn path=/trunk/; revision=52884
2013-10-27 01:11:15 +00:00
Jeff Morriss 0cc2c88c2e Fix more SVN properties.
svn path=/trunk/; revision=52834
2013-10-25 01:25:23 +00:00
Balint Reczey 2ec414c257 Minor refactoring in CMake ABI dump generation
svn path=/trunk/; revision=52689
2013-10-19 15:51:36 +00:00
Balint Reczey 70dce86ab3 Set and use TMPDIR for ABI dump generation when using CMake
svn path=/trunk/; revision=52688
2013-10-19 14:55:12 +00:00
Balint Reczey 8956ee2a56 Factor out common parts of ABI checks to UseABICheck.cmake
svn path=/trunk/; revision=52614
2013-10-15 07:30:05 +00:00
Jörg Mayer 3af074a3f6 Make pkgconfig work - sort of:
- fix a typo
- Add the library dirs and not just the libraries.
  This would help if the paths that are now returned
  were actually correct.

svn path=/trunk/; revision=52598
2013-10-14 14:53:36 +00:00
Gerald Combs 3118bd5198 Don't clobber PKG_CONFIG_PATH.
svn path=/trunk/; revision=52589
2013-10-13 18:59:23 +00:00
Graham Bloice 1299f24e7b Set CMake to use Python when building the tap register files.
svn path=/trunk/; revision=52581
2013-10-13 09:47:32 +00:00
Jörg Mayer 3ab8799526 Remove some things that I added while not understanding the real
problem/solution.
"Long" since solved by copying the solution from Makefile.nmake.

Small update to the status of cmake builds on windows

svn path=/trunk/; revision=52574
2013-10-12 22:08:03 +00:00
Jörg Mayer f5fd46fe6d qtshark and wireshark(gtk2) now actually find their libs.
svn path=/trunk/; revision=52539
2013-10-11 11:11:41 +00:00