Commit Graph

1054 Commits

Author SHA1 Message Date
Jörg Mayer 0fda991f45 First try to install docbook stuff as well - not yet working
svn path=/trunk/; revision=34896
2010-11-16 00:20:31 +00:00
Jörg Mayer 3c349772fb - Pod stuff is independent of the guides, so check/use
it indepently.
- AND needs to be in caps.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4879

svn path=/trunk/; revision=34325
2010-10-02 06:45:49 +00:00
Jörg Mayer b4b1ad9963 Fix for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4879
where the build would fail if no gtk2 development files
were found.

svn path=/trunk/; revision=34308
2010-10-01 12:17:11 +00:00
Jörg Mayer 34c7218d1a - Reorder how packagetests are run
- Add packet-reload.c
- Make most packages not-required (not tested)
- Does *not* (yet) add an optional/whatever case to enable_


svn path=/trunk/; revision=34307
2010-10-01 08:40:52 +00:00
Jörg Mayer eb1fdd0f27 - Reset a few more variables used in FindXYZ scripts.
- README.cmake: small update.
- Set a variable before using it for installation.

svn path=/trunk/; revision=34274
2010-09-28 19:23:15 +00:00
Jörg Mayer 4bfd2dfdf1 - FindGLIB2.cmake updates from
http://www.opensync.org/browser/branches/3rd-party-cmake-modules/modules
  + split out FindGMODULE2.cmake
  + contains /sw/... by default
  + supposedly tested on OSX
- Disable pcre for cmake builds by default, gregex should be
  picked up automatically if glib2 is not too old.

Should you have trouble linking due to some libgmodule... stuff
undefined, please add "${GMODULE2_LIBRARIES}" after "${GLIB2_LIBRARIES}"
an report back.

svn path=/trunk/; revision=34248
2010-09-25 15:38:12 +00:00
Guy Harris 8257e6e816 Actually do what I said I did in the previous checkin.
svn path=/trunk/; revision=34244
2010-09-24 21:18:39 +00:00
Guy Harris ac3ac6c476 Plugins are not shared libraries, so:
1) don't set thei SOVERSION - run-time-loaded modules don't have
	   an SOVERSION;

	2) build them with link mode MODULE, not SHARED, on all
	   platforms.

(Fixing 1) also fixes the problem with building them as MODULE on OS X.)

svn path=/trunk/; revision=34243
2010-09-24 20:41:34 +00:00
Jörg Mayer e84f210167 Undo some part of
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=34224

This fix is wrong. We need to find out why this fails and correct it in


svn path=/trunk/; revision=34226
2010-09-23 21:18:04 +00:00
Jörg Mayer 79d806450f H.sivank:
Cmake fixes.

svn path=/trunk/; revision=34225
2010-09-23 21:14:23 +00:00
Stig Bjørlykke e60eeb3602 Some CMake fixes from H.sivank:
- Apple gcc does not like "-Wl,--as-needed".
- Fix plugins link step on OSX.
- Put AUTHORS-SHORT, AUTHORS-SHORT-FORMAT and wireshark.pod in build directory.

svn path=/trunk/; revision=34224
2010-09-23 21:06:31 +00:00
Jörg Mayer f337b03f39 Copy behaviour of
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=34145
to cmake.

svn path=/trunk/; revision=34205
2010-09-23 09:05:31 +00:00
Jörg Mayer de68ad3066 H. Sivank <hsivank@gmail.com>
I try to configure Wireshark with cmake on macosx 10.6.
It fails with : set_target_properties called with incorrect number of arguments.
Attached a patch to fix this issue.


svn path=/trunk/; revision=34201
2010-09-23 07:02:33 +00:00
Jörg Mayer de916f6bfb Try to add support to learn the HTML_VIEWER variable and the DOC_DIR variables from the environment - not yet working
svn path=/trunk/; revision=34200
2010-09-23 06:59:41 +00:00
Jeff Morriss 9d3d2922ea From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5223 :
I would like to contribute iSCSI SRT tap, 'tap-scsistat.c' for tshark. 

The output exactly matches that of the Wireshark's iSCSI(disk) SRT dialog.

From me: a couple of small changes to make it compile without warnings.

svn path=/trunk/; revision=34152
2010-09-18 01:03:45 +00:00
Stig Bjørlykke 8d8c397852 Use absolute paths in link_directories.
svn path=/trunk/; revision=34098
2010-09-10 16:50:12 +00:00
Jörg Mayer 7807a0d846 - Copy over from Makefile.am: dumpcap doesn't need to link
in libgcrypt and gnutls.
- capinfos has a dependency on svnversion.h

svn path=/trunk/; revision=33559
2010-07-17 14:07:13 +00:00
Jörg Mayer 9f9b4fbf71 Fix cmake build for wireshark-filters.
svn path=/trunk/; revision=33546
2010-07-15 22:50:28 +00:00
Gerald Combs 69df102b4e Don't include the filter list (which is now over 16MB) in the
wireshark-filter man page. Point to other sources for the list instead.

svn path=/trunk/; revision=33539
2010-07-15 16:18:13 +00:00
Jörg Mayer 08619accd1 - Update todo list
- Add dftest and randpkt manpages to sync with autofoo


svn path=/trunk/; revision=33521
2010-07-14 16:16:29 +00:00
Jörg Mayer 09bbfe21dd - Add tap-sv.c and packet-sv.c to the list of files to build
- Whitespace fixes
- Add Fedora 64 bit to the list of platforms where cmake should
  work

svn path=/trunk/; revision=33073
2010-06-03 13:04:22 +00:00
Jeff Morriss 47e2d75820 Move some code (including the optional objects) into libwsutil
svn path=/trunk/; revision=33012
2010-05-28 20:19:55 +00:00
Guy Harris f036ba32ab At least according to the CMake 2.6 documentation,
CHECK_VARIABLE_EXISTS() can be used to check for C variables; use that
to check for pcap_version.

svn path=/trunk/; revision=32938
2010-05-24 22:50:30 +00:00
Jörg Mayer 47e4c55698 - Add a comment about the magic in the FindXXX.cmake filenames.
- Fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4786
  Define HAVE_PCAP_VERSION if HAVE_PCAP_LIB_VERSION is set.

svn path=/trunk/; revision=32936
2010-05-24 21:59:29 +00:00
Jörg Mayer 76cee2c2a1 Commit 32350 replaced the self written FindZ.cmake by cmakes
FindZLIB.cmake. What it didn't do was do adapt the magic names
that are derived from the name of the FindXXX.cmake script.
Fix that. Also add $Id$ to the FindZLIB.cmake script.

svn path=/trunk/; revision=32899
2010-05-19 13:05:35 +00:00
Jörg Mayer 3da0724510 text2pcap_scanner.l does not compile without warnings
on my system - add it to the non-clean file list.

svn path=/trunk/; revision=32825
2010-05-15 21:40:25 +00:00
Jörg Mayer e4eecc5215 - Move cmake options into their own file, making it easier to
use a locally modified version of the stuff
- Some (still preliminary) CPack changes
- Add -fexcess-precision=fast (configure.in and CmakeLists.txt)
  to the compileflags (new gcc-4.5 feature to maintain backward
  compatibility with gcc-4.4 and IMO we don't need the slower but
  more exact implementation gcc 4.5 offers.

svn path=/trunk/; revision=32823
2010-05-15 20:41:53 +00:00
Kovarththanan Rajaratnam 7133f6944d Sync ZLIB from CMake trunk
svn path=/trunk/; revision=32350
2010-04-01 10:10:48 +00:00
Jörg Mayer 96779de920 cmake changes:
- Add checking for linker flags
- Install plugins with the name including the Wireshark version.
  This will make it easier to find matching plugin versions if
  files get just copied over.


svn path=/trunk/; revision=32231
2010-03-18 10:27:17 +00:00
Uwe Girlich c4d29dfd99 This adds a new dissector plugin: INTERLINK. This protocol is used in
(real and simulated) BMW cars for all kinds of gadget communication.
My plugin only dissects the high level infrastructure and not any particular
messages. It uses a heuristic dissector to detect INTERLINK packets.

svn path=/trunk/; revision=32202
2010-03-16 06:58:25 +00:00
Jörg Mayer 6de362457d - Derive Wireshark version from configure.in for now.
Allow to overide that version in CMakefile.txt
- Minor update to README.cmake
- Turn off GTK_DEBUG


svn path=/trunk/; revision=32139
2010-03-07 19:40:25 +00:00
Anders Broman 1a855bfde2 From Andrej Kuehnal:
New feature: extract specified diameter AVPs from large capture files.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4560

svn path=/trunk/; revision=32132
2010-03-06 20:54:58 +00:00
Jörg Mayer ced2d1c434 Copy over the introduction of Makefile.common change
Replace FindGTK2 by version included in cmake 2.8.x

svn path=/trunk/; revision=32119
2010-03-04 23:35:43 +00:00
Jörg Mayer 914983a0dc Almost working out-of-tree builds for the documentation,
with a few hacks right now:
- The tip.png, warning.png and note.png images are missing from the
  pdfs and I have no idea how to tell fop how to find them.
- Disabling/enabling building the guides via option currently doesn't
  work (probably too many macros :-), so comment out the subdir instead.
- Right now, in order to build the devleopers guide we need to do the
  following in the source docbook directory:
  touch wsdg_graphics/toolbar/dummy.dummy

Apart from these: The build works with a pristine docbook dir
(svn status --no-ignore).

svn path=/trunk/; revision=32004
2010-02-25 12:30:44 +00:00
Stig Bjørlykke 229d8368bc Set correct locale in make-version.pl instead of in Makefiles.
Added back add_custom_command for svnversion.h.
Removed unnecessary text2pcap_CLEAN_FILES.
Fix indent for ps.c command.

svn path=/trunk/; revision=31525
2010-01-14 15:43:33 +00:00
Stig Bjørlykke 37cb4333a4 Add a target to always run make-version.pl to check if svn version has changed.
svn path=/trunk/; revision=31516
2010-01-13 19:09:47 +00:00
Jörg Mayer 9a69a7934e - Beginnings of cmake in docbook directory
- Add note about "make help"
- Move beginnings of packaging into its own file: CPackConfig.txt

svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
Stig Bjørlykke 86e83facfc Added GCRYPT_LIBRARIES to capinfos.
svn path=/trunk/; revision=31205
2009-12-08 11:04:52 +00:00
Kovarththanan Rajaratnam 2e89962e05 CMake: Bump the version to 1.3.3
svn path=/trunk/; revision=31065
2009-11-24 06:52:27 +00:00
Jörg Mayer 6bf88e90bf Need to add svnversion.h to the build list to make
sure it is generated whatever the build order is.

svn path=/trunk/; revision=30988
2009-11-17 12:28:06 +00:00
Jörg Mayer d2cc318f4f Beginnings of enabling static builds. Still to do:
* Add -static
* Registration may need different handling
* Add plugins
* Build error in wslua

svn path=/trunk/; revision=30987
2009-11-17 11:58:36 +00:00
Jörg Mayer 4ec4b16285 - Add the new dissector files
- Small preparations for adding back platform specific files
- Small preparations for building the guides

svn path=/trunk/; revision=30944
2009-11-12 23:09:44 +00:00
Jörg Mayer 564500f873 - Generate manpages and html version of manpages
- Detect pod2man/pod2html to do that
- Install manpages and html version thereof


svn path=/trunk/; revision=30934
2009-11-11 16:20:37 +00:00
Stig Bjørlykke 7236f6ed77 Make it possible to disable WERROR.
svn path=/trunk/; revision=30864
2009-11-08 16:59:15 +00:00
Jörg Mayer 2cda5ff441 Add a few more optional compiler warnings and some (commented out)
ideas for linker flags.

svn path=/trunk/; revision=30853
2009-11-07 10:08:36 +00:00
Jörg Mayer 9ee31d1d0e cmake will now honor -Werror if configured (default: on)
svn path=/trunk/; revision=30852
2009-11-07 10:07:00 +00:00
Jörg Mayer dbed842cb8 New version is 1.3.2
svn path=/trunk/; revision=30753
2009-10-29 07:04:34 +00:00
Jörg Mayer e0ce6d735d Remove an obsolete comment
svn path=/trunk/; revision=30689
2009-10-25 10:33:10 +00:00
Kovarththanan Rajaratnam 6d2018b31b Group subdirectories
svn path=/trunk/; revision=30462
2009-10-10 05:57:25 +00:00
Kovarththanan Rajaratnam ee95203649 Add tools/lemon/CMakeLists.txt which creates the lemon parser executable
svn path=/trunk/; revision=30461
2009-10-10 05:51:08 +00:00
Kovarththanan Rajaratnam 142131917c Compile and link idl2wrs
svn path=/trunk/; revision=30460
2009-10-10 05:35:21 +00:00
Kovarththanan Rajaratnam adb0bb97bc Fix copy/paste error
svn path=/trunk/; revision=30438
2009-10-09 17:00:47 +00:00
Kovarththanan Rajaratnam 1615cdcba6 Start using register_tap_files() macro
svn path=/trunk/; revision=30437
2009-10-09 16:56:15 +00:00
Kovarththanan Rajaratnam 74679ab0c8 Introduce UseMakeTapReg.cmake
svn path=/trunk/; revision=30436
2009-10-09 16:54:30 +00:00
Kovarththanan Rajaratnam f4880ee550 Add register_dissector_files macro
svn path=/trunk/; revision=30433
2009-10-09 16:24:22 +00:00
Kovarththanan Rajaratnam b2746f1628 Also capitalize wireshark_BINARY_DIR since this variable is automatically defined by cmake according to the project name
svn path=/trunk/; revision=30428
2009-10-09 11:21:22 +00:00
Kovarththanan Rajaratnam 5cbe36c441 Capitalize project name
svn path=/trunk/; revision=30427
2009-10-09 10:47:02 +00:00
Kovarththanan Rajaratnam c769074ad3 Remove FindWSWIN32.cmake. It was only a temporary hack I introduced. We should add Windows support in a more clean fashion.
svn path=/trunk/; revision=30408
2009-10-08 16:54:20 +00:00
Kovarththanan Rajaratnam 1b2498d074 Move make-tapreg-dotc to tools/make-tapreg-dotc
svn path=/trunk/; revision=30284
2009-10-04 08:10:54 +00:00
Kovarththanan Rajaratnam ac8f637590 Move rdps.py to tools/rdps.py
svn path=/trunk/; revision=30281
2009-10-04 07:50:36 +00:00
Jörg Mayer cbc3d3f772 Try to add tpg, but it seems it doesn't build with autofoo either.
svn path=/trunk/; revision=30151
2009-09-25 18:09:42 +00:00
Jörg Mayer 53acec3427 wslua now builds, links and installs.
Enable it by default.

svn path=/trunk/; revision=30142
2009-09-25 14:53:56 +00:00
Stig Bjørlykke b1fde640d6 Removed some duplicate libraries.
svn path=/trunk/; revision=30141
2009-09-25 12:50:03 +00:00
Jörg Mayer f69d1f84b8 - Previous patch moved the intall targes dirs too far down.
- Install some auxiliary files (AUTHORS-SHORT, manuf, ...)

svn path=/trunk/; revision=30135
2009-09-25 02:50:48 +00:00
Jörg Mayer c131599cf7 Slightly rework the detection code for some packages.
Make compile flag detection work (needed some not so nice hacks).

svn path=/trunk/; revision=30129
2009-09-24 20:42:08 +00:00
Stig Bjørlykke 234ba3192e Added Apple Cocoa library to processes dumping OSX version.
Added Apple CoreServices to wireshark.

svn path=/trunk/; revision=30106
2009-09-23 19:52:45 +00:00
Jörg Mayer ebfcf3c387 Build more plugins with cmake.
svn path=/trunk/; revision=30084
2009-09-23 04:41:14 +00:00
Jörg Mayer 95182116aa CMake:
- Add opcua to the list of plugins to build
- Link the gtk stuff statically into wireshark
- Beginnings of "make install"
- Change a few things about install paths

svn path=/trunk/; revision=30029
2009-09-21 00:19:07 +00:00
Jörg Mayer 5a2247f5a3 Build a few more plugins
svn path=/trunk/; revision=29942
2009-09-16 06:30:03 +00:00
Jörg Mayer 14a4c630fd Move some of the -I stuff from top level to epan.
svn path=/trunk/; revision=29941
2009-09-16 04:20:58 +00:00
Jörg Mayer 24fb135ffe Build the asn1 plugin. The only problem(?) is, that it is
name libasn1.so instead of asn1.so

svn path=/trunk/; revision=29919
2009-09-15 12:22:13 +00:00
Jörg Mayer 7d2d32a974 Not yet working:
Sync with autofoo: Check for accepted compiler flags. Use
  identical flags.

svn path=/trunk/; revision=29891
2009-09-14 06:51:22 +00:00
Jörg Mayer 7eed375f9d Make building with GeoIP, Python, Capabilities and c-ares
actually work.

svn path=/trunk/; revision=29870
2009-09-12 17:20:08 +00:00
Jörg Mayer 9250a69a99 Update to add the last missing detection stuff.
Some of it is untested, kerberos is currently a hack.
Apart from that, package detection should be complete.

svn path=/trunk/; revision=29838
2009-09-10 07:04:54 +00:00
Kovarththanan Rajaratnam 2547ce21bf We no longer support the old plugin API so remove it completely from the build system
svn path=/trunk/; revision=29821
2009-09-09 14:01:57 +00:00
Jörg Mayer 8694c4ba3c Add missing include dirs when building wslua.
wslua doesn't build due to some probably non-cmake
related problem (have to verify though).

svn path=/trunk/; revision=29820
2009-09-09 13:27:25 +00:00
Jörg Mayer ca6b1e2b21 CMAKE: Get most of of missing *build* pieces into place
svn path=/trunk/; revision=29819
2009-09-09 13:20:33 +00:00
Jörg Mayer 443f384fef Build new packetlist
svn path=/trunk/; revision=29800
2009-09-08 16:07:14 +00:00
Jörg Mayer 1aca48909c - now wireshark compiles with cmake as well
svn path=/trunk/; revision=29799
2009-09-08 15:56:16 +00:00
Jörg Mayer 3b3ea47176 dftest and rawshark now build.
tshark might build.


svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
Jörg Mayer 9500e97cb3 - Undo the PACKAGELIST WSWIN32 stuff in CMakeLists.txt:
That's what the packages are for, so instead of creating
  WSWIN32, the stuff should probably go into the GLIB2
  package.
- libwireshark now compiles - no time to add linking with
  it until tonight


svn path=/trunk/; revision=29756
2009-09-07 07:26:43 +00:00
Jörg Mayer d26cdc30ea Beginnings of getting cmake to build stuff in epan.
It's only beginnings, so epan is commented out in
the subdirs statement.

This is more a synch to avoid duplicate work and creating
conflicting patches to the cmake stuff.

svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
Kovarththanan Rajaratnam 746124c935 CMake: Remove PRId64, PRIu64, PRIx64, PRIX64, and PRIo64 which are unused
svn path=/trunk/; revision=29639
2009-08-31 18:48:16 +00:00
Kovarththanan Rajaratnam 6448a9917d Disable standard library deprecation when MSVC >= 2005
svn path=/trunk/; revision=29626
2009-08-30 14:12:56 +00:00
Kovarththanan Rajaratnam 185a7a8ee8 Find Win32 bundled packages
svn path=/trunk/; revision=29623
2009-08-30 08:50:47 +00:00
Kovarththanan Rajaratnam 943e829e47 Add WIN32 platform sources
svn path=/trunk/; revision=29621
2009-08-30 06:24:44 +00:00
Kovarththanan Rajaratnam cbc70f822f Rename build target to lowercase for consistency
svn path=/trunk/; revision=29618
2009-08-29 09:13:28 +00:00
Kovarththanan Rajaratnam eaa827d1ea We require CMake >= 2.6 so we don't have to repeat the expressions in endif() + friends
svn path=/trunk/; revision=29589
2009-08-27 16:11:16 +00:00
Kovarththanan Rajaratnam 9d5e12c363 Remove zlib from the set of mandatory packages (it isn't)
svn path=/trunk/; revision=29588
2009-08-27 15:55:58 +00:00
Kovarththanan Rajaratnam 74a4d8bfda Move configure checks to ConfigureChecks.cmake
svn path=/trunk/; revision=29585
2009-08-27 15:32:57 +00:00
Jörg Mayer 3b25ff6ba6 - Properly detect and use the perl command.
- Rename EDITCAP_... to editcap_... and the like.
  This should make it easier to later loop around some
  of the entries instead of processing each individually.

svn path=/trunk/; revision=28760
2009-06-16 05:52:16 +00:00
Jörg Mayer adf10f10a5 Build the other tools that don't depend on libwireshark
(editcap, capinfo, text2pcap, mergecap).

svn path=/trunk/; revision=28759
2009-06-16 05:37:46 +00:00
Jörg Mayer 67d508edaf OK, so my last commit message was too optimistic - I was using
an installed version of wsutil. dumpcap now really builds on
Linux via cmake.

svn path=/trunk/; revision=28754
2009-06-16 04:12:30 +00:00
Jörg Mayer d3fcd1a09b CMake now successfully builds dumpcap
svn path=/trunk/; revision=28745
2009-06-15 18:59:33 +00:00
Jörg Mayer 18887f7b72 Resume work on CMake for Wireshark. Finally found and fixed a
few mistakes that I made earlier.

Current status: dumpcap still doesn't build
Next step: Add a ylwrap like workaround for flex misbehaviour.

svn path=/trunk/; revision=28518
2009-05-29 10:57:47 +00:00
Jeff Morriss 86e10880c9 Remove iconv/libiconv checks from *NIX builds: GLIB-2 provides iconv replacements.
svn path=/trunk/; revision=25765
2008-07-18 12:11:08 +00:00
Sake Blok 5fe95468a2 Bug 1227 : From Frederic Heem:
* modify CMakeInstallDirs.cmake according to cmake developper wishes
* FindDBUSGLIB.cmake fixes
* Add HAVE_CHOWN 
* remove DBus from CMakeLists.txt. 
* DBus support has its own application (capdbus) and is in a self contained directory. A separate patch will be provided



svn path=/trunk/; revision=23300
2007-10-28 23:49:15 +00:00
Jörg Mayer c1684fbf44 frederic.heem:
Update/Add FindPCAP.cmake CMakeInstallDirs.cmake CMakeLists.txt

me: 
  Fix a typo, change gcc flags to mimic the behaviour of autofoo
  stuff.


svn path=/trunk/; revision=19707
2006-10-26 15:36:50 +00:00
Jörg Mayer e8a5a41045 Parts of http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1179
Frederic Heem:
* More cmake system checks. It compiles dumpcap without running configure,

svn path=/trunk/; revision=19672
2006-10-24 17:39:32 +00:00
Jörg Mayer ac260321d9 Add a comment
svn path=/trunk/; revision=19227
2006-09-13 10:51:40 +00:00
Jörg Mayer 7647b986b6 The last update to FindGTK2.cmake was incompatible with it's use.
Fix a bug and adapt CMakeLists.txt to the new usage.

svn path=/trunk/; revision=19169
2006-09-06 22:59:25 +00:00
Jörg Mayer d6417e0842 cmake/
Add some more (hackish) tests.
	Add a LICENSE file until I find the time to add it to all
	files individually.

CMakeLists.txt
	Add some addiotional stuff regarding options.
	Add (non-working) code to generate config.h
	Handle GTK1 vs GTK2 and GLIB1 vs GLIB2

svn path=/trunk/; revision=19168
2006-09-06 22:28:19 +00:00
Jörg Mayer 9f4f88e84e propset, add $Id: $ and copyright headers
svn path=/trunk/; revision=19150
2006-09-05 09:50:45 +00:00
Jörg Mayer 57656db02e OK, as I haven't had any negative feedback, I'm adding my work
to use cmake as a build system. It's in no way complete, I'd
just like others to be able to participate in playing with cmake
and to document what I'm doing.

Please read the README.cmake for what can be done right now.

svn path=/trunk/; revision=19149
2006-09-05 09:27:22 +00:00