osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
47,802 Commits 26 Branches 0 Tags 795 MiB
Commit Graph

100 Commits

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