osmocom/wireshark
14
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity
49239 commits 26 branches 0 tags 795 MiB
Commit graph

131 commits

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