f0e92efd24
The path for the Qt5 installation now needs to be set as a
...
windows environment variable.
svn path=/trunk/; revision=52540
2013-10-11 11:25:40 +00:00
f5fd46fe6d
qtshark and wireshark(gtk2) now actually find their libs.
...
svn path=/trunk/; revision=52539
2013-10-11 11:11:41 +00:00
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
564797a2e7
Try to locate QtMacExtras.
...
svn path=/trunk/; revision=52518
2013-10-10 23:11:19 +00:00
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
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
526f7cf367
The path approach can't work this way: Trying to set an environment
...
variable of our parent process isn't going to work. Plan B is to write
this stuff into a file and manually run it once.
Hard code the QT5 search path on Windows for now.
svn path=/trunk/; revision=52489
2013-10-10 09:10:53 +00:00
0863791253
Try to set PATH on Windows to all required dlls/libs to allow
...
running the executables from the build tree without installation.
It doesn't really work yet but the troubleshooting has to wait
until either I've gotten some sleep or someone else fixes it.
svn path=/trunk/; revision=52454
2013-10-08 20:41:57 +00:00
f625f54e3f
Remove an uncommented line: The file is now part of wsutil
...
svn path=/trunk/; revision=52426
2013-10-06 22:15:38 +00:00
d28324b05e
Add a comment about PCAP_VERSION
...
svn path=/trunk/; revision=52409
2013-10-06 18:11:41 +00:00
f5cebd0ef9
Hack around the "/MD overridden by /MDd" messages.
...
Better solutions welcome.
svn path=/trunk/; revision=52396
2013-10-06 12:25:46 +00:00
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
de3867e1a1
The PERL variable name is deprecated, use PERL_EXECUTABLE instead.
...
svn path=/trunk/; revision=52368
2013-10-04 16:55:33 +00:00
d5cd2f3ad9
Don't link qtshark against portaudio
...
svn path=/trunk/; revision=52283
2013-09-30 08:12:46 +00:00
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
17678f9b5d
Homebrew installs gettext (including libintl, which GLib requires) in
...
/usr/local/opt/gettext. Tell CMake to update our include and library
paths accordingly.
svn path=/trunk/; revision=51943
2013-09-10 21:24:52 +00:00
bae2eee028
Implement in cmake:
...
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=51322
> User: guy
> Date: 2013/08/12 01:01 PM
>
> Log:
> Just check whether dladdr() is available; we check in the code whether
> it succeeds, so there's no point in checking whether it succeeds in a
> sample program.
svn path=/trunk/; revision=51334
2013-08-13 09:58:09 +00:00
6ab6208e3d
Allow the python interpreter to be version 3 (2 being preferred)
...
svn path=/trunk/; revision=51128
2013-08-03 00:39:27 +00:00
87ca12fcb7
Print the flag we are testing
...
svn path=/trunk/; revision=51116
2013-08-02 07:20:43 +00:00
45589bf41d
TShark links with libui so we should always build it.
...
svn path=/trunk/; revision=51101
2013-08-01 23:40:06 +00:00
2df54da6e2
Move a bunch of the crypt modules and pint.h into wsutil.
...
This means wsutil now links against libcrypt.
Protect a bunch of the crypt header files from multiple inclusion.
svn path=/trunk/; revision=51100
2013-08-01 23:34:47 +00:00
812f308620
Use largefile detection in cmake.
...
Move wiretap/file_wrapper.c back to clean sources.
svn path=/trunk/; revision=50825
2013-07-23 09:41:35 +00:00
681c9e7160
Looks like not every version of cmake has the same behaviour wrt
...
the working directory. So hardcode the path in a case where it
didn't work for everyone.
svn path=/trunk/; revision=50817
2013-07-23 07:41:20 +00:00
fe166ca904
Wrap clang specific tests into a clang tests instead of checking
...
for APPLE.
Move 3 of the 4 tests out of this check because the improved checks
should detect them correctly now
svn path=/trunk/; revision=50789
2013-07-22 14:45:58 +00:00
43ef033128
Don't use the program name to identify the compiler - it won't work
...
reliably in cases where the compiler is name /usr/bin/cc
Use the internal variable CMAKE_<LANG>_COMPILER_ID instead, which is
finally documented (but still called internal in the docs), see
http://www.cmake.org/cmake/help/v2.8.10/cmake.html#variable:CMAKE_LANG_COMPILER_ID
svn path=/trunk/; revision=50784
2013-07-22 09:36:14 +00:00
9e7b6f1a69
Try to generate an error when calling clang with an unknown compiler
...
option. This behaviour changed in clang, see
https://bugzilla.mozilla.org/show_bug.cgi?id=731316
svn path=/trunk/; revision=50760
2013-07-21 18:12:20 +00:00
df397b4f63
Enable echld builds with cmake when building with ENABLE_ECHLD=ON
...
svn path=/trunk/; revision=50751
2013-07-21 13:34:50 +00:00
f3f910a5cf
Don't check for "APPLE" if what you really mean is "clang"
...
svn path=/trunk/; revision=50749
2013-07-21 12:53:51 +00:00
0a669967fa
Move merge.{h,c} into wiretap: these modules use wiretap to merge files.
...
svn path=/trunk/; revision=50656
2013-07-16 02:35:33 +00:00
56735f8c16
Move u3.{h,c} and g711.{h,c} into wsutil.
...
Project g711.h against multiple inclusion and add C++ compatibility wrapper.
svn path=/trunk/; revision=50654
2013-07-16 02:04:55 +00:00
2d30d5beb1
Move strnatcmp.{h,c} from epan into wsutil: there's nothing epan-specific
...
there and moving it avoids having to recompile the file for use in editcap
and mergecap (which don't link against libwireshark).
svn path=/trunk/; revision=50650
2013-07-16 01:16:50 +00:00
54bb2e7a5c
Move report_err.{h,c} from epan into wsutil: there's nothing epan-specific there and moving it avoids having to recompile the file for use in editcap and capinfos (which don't link against libwireshark).
...
svn path=/trunk/; revision=50598
2013-07-15 02:48:26 +00:00
43e20ff200
Don't use compiler options not supported by clang in XCode 4.6.3
...
on Apple platforms.
svn path=/trunk/; revision=50576
2013-07-14 12:39:25 +00:00
4dcc156cf3
Move the print modules into epan.
...
svn path=/trunk/; revision=50526
2013-07-12 03:50:50 +00:00
16206348d9
Move disabled_protos.{h,c} into epan.
...
svn path=/trunk/; revision=50521
2013-07-12 01:40:06 +00:00
45449ce1a8
Move some more modules into epan.
...
svn path=/trunk/; revision=50517
2013-07-11 23:57:11 +00:00
ce81449ed9
packet dissection now takes pointer to tvb instead of guint8 data
...
implement frame_tvbuff, right now almost a copy of 'real' tvb.
svn path=/trunk/; revision=50497
2013-07-11 05:47:02 +00:00
d602662b36
Add strnatcmp by Martin Pool for 'natural order' string comparisons, and make use of it in editcap and mergecap for listing encapsulation types. For example:
...
Before:
user0 - USER 0
user1 - USER 1
user10 - USER 10
user11 - USER 11
user12 - USER 12
user13 - USER 13
user14 - USER 14
user15 - USER 15
user2 - USER 2
user3 - USER 3
user4 - USER 4
user5 - USER 5
user6 - USER 6
user7 - USER 7
user8 - USER 8
user9 - USER 9
After:
user0 - USER 0
user1 - USER 1
user2 - USER 2
user3 - USER 3
user4 - USER 4
user5 - USER 5
user6 - USER 6
user7 - USER 7
user8 - USER 8
user9 - USER 9
user10 - USER 10
user11 - USER 11
user12 - USER 12
user13 - USER 13
user14 - USER 14
user15 - USER 15
svn path=/trunk/; revision=50482
2013-07-10 16:18:37 +00:00
b450609a55
For now, don't turn on -Wcast-align by default. There are at least some
...
bugs it points out that probably mean the code won't work on machines
that require alignment (e.g., SPARC machines), but we'll turn it on once
we fix them. (clang is fussier than GCC about this.)
svn path=/trunk/; revision=50187
2013-06-27 10:35:06 +00:00
500d399393
Move tap-*-common.{h,c} into ui/ since that's the home for common UI functions.
...
svn path=/trunk/; revision=50165
2013-06-26 02:12:12 +00:00
bbf6a3766e
Move tempfile.{h,c} into wsutil.
...
svn path=/trunk/; revision=50163
2013-06-26 01:14:35 +00:00
9ef2507e34
editcap no longer has to link against nstime.o, it's in libwsutil now.
...
svn path=/trunk/; revision=50161
2013-06-26 00:45:38 +00:00
a441793cba
Move a couple of time-related modules into wsutil.
...
A bunch of files didn't really need to include these header files so remove
the include line rather than changing it.
svn path=/trunk/; revision=50154
2013-06-25 22:02:20 +00:00
15a0d1f945
Update various warning-option lists to match what the configure script
...
adds by default.
svn path=/trunk/; revision=49670
2013-06-01 02:20:12 +00:00
7ad85db8e1
Move -Wlogical-op to list of standard compiler flags for c-only.
...
svn path=/trunk/; revision=49668
2013-06-01 00:13:25 +00:00
9f11d6cd44
capture_unix_ifnames.c is gone.
...
svn path=/trunk/; revision=49490
2013-05-22 04:17:23 +00:00
eded0ecb14
Suppress warnings when using Apple's C compiler.
...
svn path=/trunk/; revision=49305
2013-05-14 21:01:19 +00:00
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
436270ffab
Sort the list of packages to make it easier to check results.
...
svn path=/trunk/; revision=49107
2013-05-01 10:40:12 +00:00
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
Jörg Mayer