Commit Graph

568 Commits

Author SHA1 Message Date
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
Jörg Mayer 28282a991d Now the GUI programs (wireshark/gtk2 and qtshark) compile and link
svn path=/trunk/; revision=52538
2013-10-11 10:32:11 +00:00
Jörg Mayer 8719cebf38 Make airpcap detection work
svn path=/trunk/; revision=52535
2013-10-11 07:38:45 +00:00
Guy Harris 059423c27a Fix check for inflatePrime in zlib (ZLIB_LIBRARIES isn't set at that
point, you want ZLIB_LIBRARY).

svn path=/trunk/; revision=52532
2013-10-11 06:10:32 +00:00
Jörg Mayer 59e052e7c8 Fix a few things - untested until current build finishes.
svn path=/trunk/; revision=52516
2013-10-10 22:19:45 +00:00
Guy Harris baf34b0beb Don't check for pcap_version(); we don't use it.
Sort the #cmakedefines in cmakeconfig.h.in to more closely match the
order in config.h.in, to make it easier to make sure CMake and autofoo
are doing the same checks.  Remove some #cmakedefines that don't
correspond to check that are being done either by CMake or autofoo.

svn path=/trunk/; revision=52515
2013-10-10 21:02:50 +00:00
Guy Harris 260a3af9b7 Check for bpf_image(), just as the autoconf script does.
svn path=/trunk/; revision=52514
2013-10-10 20:36:11 +00:00
Jörg Mayer 2a59ee58b8 Add Airpcap detection, use it by default on win32
QT5 compile working - NOT. It's almost working, except
that I *still* need to get GTK detection working on Win :-(


svn path=/trunk/; revision=52513
2013-10-10 20:35:32 +00:00
Jörg Mayer 7c25a38963 lib is required for linking, the dlls are in bin
And with this change, I'm finally able to run the executables in the
top builddir.

svn path=/trunk/; revision=52498
2013-10-10 17:13:02 +00:00
Jörg Mayer 36e0adfcc1 Generate setpath.bat to set the paths necessary for running
the generated binaries inside the build dir.

svn path=/trunk/; revision=52492
2013-10-10 13:37:15 +00:00
Balint Reczey 7af36bb2db Revert "Fix using fop from CMake"
This reverts commit r52484

svn path=/trunk/; revision=52488
2013-10-10 08:41:14 +00:00
Balint Reczey 6602789a48 Fix using fop from CMake
svn path=/trunk/; revision=52484
2013-10-10 05:02:50 +00:00
Jörg Mayer 6013cbd4f5 Try to get gtk3 detection working via pkg-config
(not yet working).

svn path=/trunk/; revision=52432
2013-10-07 00:25:43 +00:00
Jörg Mayer 2e59bc7c89 Use the correct syntax for the shell
svn path=/trunk/; revision=52425
2013-10-06 22:14:37 +00:00
Jörg Mayer f016e8c0a4 Libwireshark now links on windows with cmake
svn path=/trunk/; revision=52424
2013-10-06 21:25:44 +00:00
Jörg Mayer 88eb04035c Fix a typo
svn path=/trunk/; revision=52418
2013-10-06 20:32:56 +00:00
Jörg Mayer c73bbc6150 Make FindGTK3 work again
svn path=/trunk/; revision=52416
2013-10-06 19:58:18 +00:00
Jörg Mayer 7888bec0bc Missed this part of Grahams patch.
svn path=/trunk/; revision=52411
2013-10-06 18:19:58 +00:00
Jörg Mayer 59cca5016b Finding GTK3 works now, but the list of libs is incomplete
svn path=/trunk/; revision=52408
2013-10-06 18:11:05 +00:00
Jörg Mayer efb42cf8dc Rewrite FindPCAP.cmake to current practices
svn path=/trunk/; revision=52405
2013-10-06 15:56:30 +00:00
Jörg Mayer f303dfdd05 Fix a typo (letover from autotools times) which accidentally
worked with cmake on unix but not on windows

svn path=/trunk/; revision=52384
2013-10-05 21:23:57 +00:00
Jörg Mayer eb1ee413e3 editcap and capinfos compile now with cmake
svn path=/trunk/; revision=52382
2013-10-05 20:49:44 +00:00
Jörg Mayer 7b3ac2ae6b Attempt to get linking working with cmake - without success so far.
svn path=/trunk/; revision=52377
2013-10-05 10:17:21 +00:00
Jörg Mayer 150fb747a6 Make runlex.sh work on Windows
svn path=/trunk/; revision=52373
2013-10-04 23:23:16 +00:00
Jörg Mayer 21bfea7309 Looks like we have problems invoking shell scripts from
cmake on windows - so explicitely run the shell with the
script as argument

svn path=/trunk/; revision=52372
2013-10-04 22:18:57 +00:00
Jörg Mayer 3c96218548 Get pod2man to work on windows: call via perl
svn path=/trunk/; revision=52367
2013-10-04 16:55:04 +00:00
Jörg Mayer 6c498c7420 Add Win support (and add a "hacked" case where the zlib
stuff has been compiled in place but not installed)

svn path=/trunk/; revision=52363
2013-10-04 15:42:23 +00:00
Jörg Mayer 325d8315ea Detecting these modules finally works on Windows setup
svn path=/trunk/; revision=52361
2013-10-04 15:10:27 +00:00
Jörg Mayer 319d0fb4d2 Cleanup similar to FindGTHREAD2.cmake
svn path=/trunk/; revision=52360
2013-10-04 13:22:36 +00:00
Jörg Mayer 2103728291 Remove now unneeded stuff missed by previous cleanup.
svn path=/trunk/; revision=52359
2013-10-04 13:22:01 +00:00
Jörg Mayer 5ec13cf1ba Remove a debug "printf"
svn path=/trunk/; revision=52358
2013-10-04 13:08:21 +00:00
Jörg Mayer 00ab245568 Replace the old version by a more modern one that only
tries to find glib2 and  not other stuff as well.
Not tested on OS X due to problems with my build environment.

svn path=/trunk/; revision=52356
2013-10-04 12:49:06 +00:00
Jörg Mayer f485beaf4a Update coding style, use FIND_PACKAGE_HANDLE_STANDARD_ARGS
instead of doing handmade stuff to the same effect.

svn path=/trunk/; revision=52352
2013-10-04 08:13:07 +00:00
Jörg Mayer 0e6a5331a1 Fix a typo
svn path=/trunk/; revision=52351
2013-10-04 07:48:25 +00:00
Jörg Mayer e56915bad9 Fogot to set the <package>_INCLUDE_DIRS variable, thus it
would only work on platforms where the required path got set for
another package

svn path=/trunk/; revision=52350
2013-10-04 07:41:43 +00:00
Jörg Mayer 21bcd56a69 Fix a typo (a missed replace)
svn path=/trunk/; revision=52234
2013-09-27 22:30:34 +00:00
Jörg Mayer d456079b7e Beginnings of win cmake support (not yet working), created by Graham Bloice,
some smaller changes by me.
- README.cmake
  Document how to (one day) run on Windows
- CMakeLists.txt
  Use MSVC compiler flags for MSVC instead of gcc flags
- FindWSWinLibs.cmake
  New: Creates HINTS for finding includes and libraries
  inside the Wireshark support library installation.
- FindXXX.cmake
  Make use of HINTS generated by FindWSWinLibs.cmake

This has not really been tested on Windows as my installation seems to have
automagically downloaded some fixes and is in an inconsistent state since.
Will probably need to reinstall.

svn path=/trunk/; revision=52194
2013-09-23 21:45:55 +00:00
Jörg Mayer fb834104e5 When building packet-dap.c on an empty build tree, packet-dap.c would
be incorrect on the first pass and only be correct when remade.
The reason was that disp-exp.cnf was created incorrectly on first pass.
disp-exp.cnf required dop-exp.cnf to build correctly, so add a mechanism
to add dependencies for export files.

Note: Only the cmake change has been tested, the autofoo stuff requires
  testing.

svn path=/trunk/; revision=52120
2013-09-17 18:02:25 +00:00
Jörg Mayer 3b5aaefce3 - Extract variables from Makefile.common.
- Apply this to asn1/c1222/

svn path=/trunk/; revision=51324
2013-08-12 22:17:06 +00:00
Jörg Mayer 7a324cfcd6 Fix a bug that will prevent the extra flags from being honored.
svn path=/trunk/; revision=50876
2013-07-24 20:42:11 +00:00
Jörg Mayer ae6007ab11 Copy over from cmake git head as it fixes a bug:
The detection will not work if the locale is non-English

svn path=/trunk/; revision=50875
2013-07-24 20:40:40 +00:00
Jörg Mayer 1cbd49e61b Copy over cmake largfile detection from the gromacs project.
svn path=/trunk/; revision=50824
2013-07-23 09:40:21 +00:00
Jörg Mayer 875040ec1e And back it out again, just like the Makefile.am
svn path=/trunk/; revision=49926
2013-06-14 11:44:19 +00:00
Jörg Mayer 5e974e8f45 Copy over
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=49865
to cmake

svn path=/trunk/; revision=49925
2013-06-14 11:42:40 +00:00
Jörg Mayer eab4f3893d Remove generating .cnf files from all target. They will
be generated when needed.

svn path=/trunk/; revision=49241
2013-05-11 10:53:04 +00:00
Jörg Mayer 1d5891111e Make exports actaully work
Add ansi_map as first generated file that uses exports (from gsm_map in
  this case).

svn path=/trunk/; revision=49195
2013-05-07 03:59:29 +00:00
Jörg Mayer 5ba458916a Move common code into UseAsn2Wrs.cmake.
Include the new file.
Use the new file.
Add cmake support to rebuild the gsm_map dissector.

svn path=/trunk/; revision=49194
2013-05-07 03:25:49 +00:00
Jörg Mayer 6f872b0e17 Attempted fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8619
When there are several versions of lua installed, try to pick the library
version that matches the include file(s) we selected.

svn path=/trunk/; revision=49164
2013-05-04 23:06:15 +00:00
Jörg Mayer 10bd5631e4 Print the version of the include files that will be used.
svn path=/trunk/; revision=49106
2013-05-01 10:34:15 +00:00
Jörg Mayer 30653b7e16 - Fix logic for finding packages with differing Find-name
and returned variable-names:
  Old: Provide the var name and adapt the find-name
  New: Provide the find-name and adapt the var name
  This allows for different packages with the same var name.
  This chage effects Qt4 and PythonInterp.
- Replace self created FindPYTHON with cmake provided
  FindPythonLibs.

svn path=/trunk/; revision=49105
2013-05-01 09:20:59 +00:00
Guy Harris 9bd43d3c28 If we somehow manage to find libnl version 2 or 3, but don't manage to
find the corresponding libnl-genl or libnl-route libraries, act as if we
didn't find libnl.

If we didn't find libnl version 2 or 3, don't check whether it's version
2 or 3.

svn path=/trunk/; revision=48742
2013-04-04 21:09:10 +00:00
Guy Harris bef6c70406 Don't set HAVE_LIBNL1 if we have don't libnl at all.
svn path=/trunk/; revision=46146
2012-11-22 18:01:42 +00:00
Jörg Mayer af53ae35b5 Remove trailing whitespace
svn path=/trunk/; revision=45118
2012-09-25 01:20:51 +00:00
Jörg Mayer c7bf21cbf1 Differentiate between libnl versions. Feature parity with autofoo
for libnl.

svn path=/trunk/; revision=44876
2012-09-11 10:48:43 +00:00
Jörg Mayer 0fc383a98f Only check if the NL-stuff isn't in the caches already
svn path=/trunk/; revision=44838
2012-09-10 12:16:44 +00:00
Jörg Mayer d8a7eed0a7 Get netlink detection working with cmake (not complete)
svn path=/trunk/; revision=44791
2012-09-06 10:37:17 +00:00
Evan Huus 5e4108c347 Have CMake also consider the include path "lua5.2" (note the dot),
since that is where it can be found on recent Ubuntus, and without it
you get a mix of 5.1 includes and 5.2 libraries, which breaks the build.

svn path=/trunk/; revision=44669
2012-08-25 19:12:03 +00:00
Jörg Mayer d888220064 Replace if(os1) endif() if(os2) endif() with elseif
svn path=/trunk/; revision=44632
2012-08-23 12:27:50 +00:00
Jörg Mayer c0da019caa Complete cmake support for netlink detection
svn path=/trunk/; revision=43421
2012-06-20 20:59:43 +00:00
Jörg Mayer f41c0b67d1 Try to detect Lua 5.2 as well
svn path=/trunk/; revision=43307
2012-06-17 12:08:42 +00:00
Jörg Mayer ffd84cbf3c Linking against GTK3 stoped working because only libgtk3 was linked
against and no libs that gtk3 depended on. Fix this.

svn path=/trunk/; revision=39970
2011-11-21 15:39:25 +00:00
Jörg Mayer 03fe88b31f Mimic test for IPv6 support in GeoIP from autofoo
svn path=/trunk/; revision=39307
2011-10-08 06:09:38 +00:00
Stig Bjørlykke 5603cef9f2 Remove support for libpcre, we use GRegex in GLib.
svn path=/trunk/; revision=38683
2011-08-23 09:25:06 +00:00
Gerald Combs 15d5c762fe FindGTK2: Add a check for pangocairo. It has to be linked explicitly, at
least for MacPorts.
FindPCAP: Define HAVE_PCAP_CREATE if we have pcap_create.

svn path=/trunk/; revision=38372
2011-08-05 18:52:53 +00:00
Jörg Mayer 1f142a1404 Add call to FindPackageHandleStandardArgs
svn path=/trunk/; revision=38361
2011-08-05 12:25:54 +00:00
Jörg Mayer 46d4528e3d Attempt to properly fix the missing path information for glib libraries
svn path=/trunk/; revision=38360
2011-08-05 12:21:46 +00:00
Jörg Mayer 385b7f4fbb Remote trailing whitespace
svn path=/trunk/; revision=37993
2011-07-12 21:21:13 +00:00
Jörg Mayer 950e4d19ad Add detection of rpcap support in libpcap and use it if available.
svn path=/trunk/; revision=37914
2011-07-06 09:28:40 +00:00
Jörg Mayer 8aada8637d As pointed out by Jakub Zawadzki:
While updating to the current cmake version of FindZLIB I missed
a Wireshark specific addition. Add it back.

svn path=/trunk/; revision=37626
2011-06-08 21:33:38 +00:00
Jörg Mayer 48904e0a71 Add GTK3 cmake options. It doesn't build, just like its configure pendant.
svn path=/trunk/; revision=37623
2011-06-08 18:10:03 +00:00
Jörg Mayer fc59537249 Last patch removed $Id$ head line
svn path=/trunk/; revision=37620
2011-06-08 17:07:06 +00:00
Jörg Mayer a0116ff94f Copy over changes from cmake git HEAD.
svn path=/trunk/; revision=37619
2011-06-08 16:24:36 +00:00
Ronnie Sahlberg bf2c1a9dcb From Matthieu Patou <mat@matws.net>
Add extra paths for finding GTK2
This makes wireshark build on 64 bit Natty boxens


svn path=/trunk/; revision=37515
2011-06-02 06:59:23 +00:00
Jörg Mayer 619dad545b Update to FindGTK2 from cmake 2.8.3. Add back quartz options which
are not part of the official cmake release.

svn path=/trunk/; revision=37198
2011-05-17 04:20:35 +00:00
Jörg Mayer 811afde69e Play catch up with recent configure.in changes:
- Link dumpcap (and only dumpcap) against gthread
- gtk/gsm_a_stat.c and gtk/menus.c are dirty when configured with UI_MANAGER=1
- Add support run "cmake ... -DWANT_PACKET_EDITOR=1 ..."


svn path=/trunk/; revision=37103
2011-05-12 21:13:00 +00:00
Jeff Morriss b9b68170f0 Don't check for the existence of gzclearerr() any more.
Check for inflatePrime().

svn path=/trunk/; revision=36955
2011-04-29 18:29:26 +00:00
Jaap Keuter 814ddc15a3 Accommodate the CMake build on Ubuntu 10.10.
svn path=/trunk/; revision=35888
2011-02-09 07:43:34 +00:00
Guy Harris 6db0ab4e90 From H.sivank:
-A patch to fix configure with cmake with macports libs.
	(gdk-pixbuf has now its own port. Location of headers has
	changed.)

svn path=/trunk/; revision=35429
2011-01-08 18:46:01 +00:00
Jörg Mayer a7f7ada049 cmake stuff:
- Fix fallout from gtk/text_import_scanner.l patch: Wireshark will
  build with cmake again.
- Update README.cmake a bit
- Running "cmake -DUI_MANAGER=ON" will give you the new ui-manager.


svn path=/trunk/; revision=34885
2010-11-15 20:25:28 +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
Stig Bjørlykke b54d0a2ed9 Reset CMAKE_REQUIRED_FLAGS after checking flags.
svn path=/trunk/; revision=34233
2010-09-24 10:23:55 +00:00
Jörg Mayer 79d806450f H.sivank:
Cmake fixes.

svn path=/trunk/; revision=34225
2010-09-23 21:14:23 +00:00
Jörg Mayer e762964cd7 Add check for HAVE_GZCLEARERR.
svn path=/trunk/; revision=34204
2010-09-23 07:43:04 +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
Stig Bjørlykke d8c9646fc2 Set missing svn:keywords and svn:eol-style.
svn path=/trunk/; revision=33616
2010-07-22 12:18:36 +00:00
Jörg Mayer fbbf502752 Jose Pedro Oliveira <jpo@di.uminho.pt>
(via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4786)

Add missing +INCLUDE(CheckVariableExists) to make the previous
commit work.

svn path=/trunk/; revision=32939
2010-05-24 23:41:21 +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 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
Kovarththanan Rajaratnam 73f3771046 Add readme to track modules
svn path=/trunk/; revision=32351
2010-04-01 10:13:47 +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
Guy Harris e6ecddd41f Add CMake tests for pcap_datalink_val_to_description() and
pcap_free_datalinks().

Sort the CMake tests in cmake/modules/FindPCAP.cmake into the same order
as the tests in the autoconf script, and note that, in the autoconf
script, the checks for pcap_open_dead() and pcap_freecode() do more than
just look for the routines in the library.

svn path=/trunk/; revision=32225
2010-03-17 19:31:33 +00:00
Stig Bjørlykke b2485fb4e7 Added search for GDKPIXBUF to help building on OSX.
svn path=/trunk/; revision=32141
2010-03-08 08:21:17 +00:00
Stig Bjørlykke 3fbb73716c Search for includes and libs in /opt/local/ (MacPorts).
svn path=/trunk/; revision=32129
2010-03-06 20:01:50 +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
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
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 f0d8951ae0 Also look for /usr/bin/open as HtmlViewer.
svn path=/trunk/; revision=30874
2009-11-09 09:28:00 +00:00
Jörg Mayer 5654d71f04 The Feature summary of cmake 2.6.2 has a bug that is fixed in
2.8.x (an empty disabled feature list would display all features).
Copy in the version from cmake svn head for now.

svn path=/trunk/; revision=30563
2009-10-15 21:25:48 +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 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 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
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 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
Jörg Mayer eefc0ffc3d While trying to understand commit 30107, I found the following at
http://www.itk.org/Bug/view.php?id=9219

Note that CMAKE_CFG_INTDIR is no longer necessary for this purpose but
has been left for compatibility with existing projects. Instead
add_custom_command() recognizes executable target names in its COMMAND

So just use "lemon" instead of specifying the full path.

svn path=/trunk/; revision=30109
2009-09-24 04:57:41 +00:00
Stig Bjørlykke 6e59814e37 Run lemon from CMAKE_CFG_INTDIR.
svn path=/trunk/; revision=30107
2009-09-23 21:23:49 +00:00
Jörg Mayer 878d7246b8 - Add $Id: $ tags
- FindHtmlViewer.cmake: Try to add reading the name of the
  html viewer from the HTML_VIEWER environment variable (untested)

svn path=/trunk/; revision=30104
2009-09-23 19:40:25 +00:00
Stig Bjørlykke d7fc9e378d Try finding gpg-error library, to improve building on OSX.
svn path=/trunk/; revision=30100
2009-09-23 18:15:31 +00:00
Stig Bjørlykke eead6ee717 Removed setting GLIB2_LIBRARIES to GLIB_LIBRARY, to improve build on OSX.
svn path=/trunk/; revision=30099
2009-09-23 18:08:16 +00:00
Stig Bjørlykke 1ed5d79a5a Try finding pixbuf and pango libraries to help building on OSX.
svn path=/trunk/; revision=30098
2009-09-23 18:02:15 +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
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 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 600a9a677b Add new windows cmake module finder
svn path=/trunk/; revision=29624
2009-08-30 08:51:43 +00:00
Kovarththanan Rajaratnam da7f3462eb Fix PATH typo. Should have been PATHS
svn path=/trunk/; revision=29620
2009-08-30 06:18:43 +00:00
Kovarththanan Rajaratnam a65ac29851 We no longer support GLib 1.x
svn path=/trunk/; revision=29617
2009-08-29 08:44:49 +00:00
Stig Bjørlykke 7ef25b683b Search for includes and libs in /opt/local/ (MacPorts).
svn path=/trunk/; revision=29465
2009-08-18 14:37:25 +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 edfa3b55b1 frederic heem:
Please find attached a patch to replace "#" with "*".
Check64BitFormat.c.in is a C file.


svn path=/trunk/; revision=19821
2006-11-06 14:16:29 +00:00
Jörg Mayer 8f10d0f24d Add same license info as in Check64BitFormat.cmake
svn path=/trunk/; revision=19768
2006-11-01 22:22:27 +00:00
Jörg Mayer 5722c7bbae frederic heem:
Please find the patch that adds copyrights.


svn path=/trunk/; revision=19744
2006-10-30 18:38:14 +00:00
Jörg Mayer fb821eb181 Only include the license text and not the rest of the source file
it was copied from as well.

svn path=/trunk/; revision=19708
2006-10-26 16:39:34 +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 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 88a7fc2494 Update to newer version of the file from
http://cmake-modules.googlecode.com/svn/trunk/

This update adds a license text (dual: GPLv2 and 3 clause BSD)

svn path=/trunk/; revision=19166
2006-09-06 22:13:52 +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