Commit Graph

597 Commits

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