Commit graph

73 commits

Author SHA1 Message Date
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