aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2013-10-19Minor refactoring in CMake ABI dump generationBalint Reczey1-3/+1
svn path=/trunk/; revision=52689
2013-10-19Set and use TMPDIR for ABI dump generation when using CMakeBalint Reczey1-4/+4
svn path=/trunk/; revision=52688
2013-10-15Factor out common parts of ABI checks to UseABICheck.cmakeBalint Reczey1-15/+2
svn path=/trunk/; revision=52614
2013-10-13Add CMake properties to targets so that they are logically organised when ↵Graham Bloice1-0/+1
using a Visual Studio solution. Add CMake properties to group the source files in epan into logical blocks when using a Visual Studio solution. svn path=/trunk/; revision=52580
2013-07-28From Linas Vepstas via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8962Evan Huus1-0/+1
Enhancement: Add STANAG 4607 file format svn path=/trunk/; revision=50996
2013-07-23Use largefile detection in cmake.Jörg Mayer1-1/+1
Move wiretap/file_wrapper.c back to clean sources. svn path=/trunk/; revision=50825
2013-07-22Move file_wrappers.c to dirty files, it has some warnings (turning errors)Jörg Mayer1-4/+8
when compiled with clang. Just for documentation: [ 6%] Building C object wiretap/CMakeFiles/wiretap.dir/file_wrappers.c.o /home/jmayer/work/wireshark/svn/trunk/wiretap/file_wrappers.c:987:28: warning: implicit conversion loses integer precision: 'gint64' (aka 'long long') to '__off_t' (aka 'long') [-Wshorten-64-to-32] if (ws_lseek64(file->fd, off, SEEK_SET) == -1) { ~~~~~~~~~~ ^~~ /home/jmayer/work/wireshark/svn/trunk/wiretap/file_wrappers.c:1051:35: warning: implicit conversion loses integer precision: 'long long' to '__off_t' (aka 'long') [-Wshorten-64-to-32] if (ws_lseek64(file->fd, offset - file->have, SEEK_CUR) == -1) { ~~~~~~~~~~ ~~~~~~~^~~~~~~~~~~~ /home/jmayer/work/wireshark/svn/trunk/wiretap/file_wrappers.c:1076:34: warning: implicit conversion loses integer precision: 'gint64' (aka 'long long') to '__off_t' (aka 'long') [-Wshorten-64-to-32] if (ws_lseek64(file->fd, file->start, SEEK_SET) == -1) { ~~~~~~~~~~ ~~~~~~^~~~~ 3 warnings generated. svn path=/trunk/; revision=50798
2013-07-16Move merge.{h,c} into wiretap: these modules use wiretap to merge files.Jeff Morriss1-0/+1
svn path=/trunk/; revision=50656
2013-04-24dumpabi: This would create the directories in the sourcedir insteadJörg Mayer1-1/+1
of the binary dir. Fixed that. NOTE: It fails with and without this patch for out of tree builds: jmayer@egg:~/work/wireshark/svn/build/qt-gtk3> make dumpabi [ 1%] Built target wsutil [ 1%] Generating libwsutil.abi.tar.gz ERROR: can't find modules cp: cannot stat `abi_dumps/libwsutil/libwsutil_*': No such file or directory make[3]: *** [wsutil/libwsutil.abi.tar.gz] Error 1 make[2]: *** [wsutil/CMakeFiles/dumpabi-libwsutil.dir/all] Error 2 make[1]: *** [CMakeFiles/dumpabi.dir/rule] Error 2 make: *** [dumpabi] Error 2 jmayer@egg:~/work/wireshark/svn/build/qt-gtk3> svn path=/trunk/; revision=49014
2013-03-30wiretap support for the CAM Inspector file formatMartin Kaiser1-0/+1
svn path=/trunk/; revision=48647
2013-03-01Export libwireshark symbols using WS_DLL_PUBLIC defineBalint Reczey1-3/+0
Also remove old WS_VAR_IMPORT define and related Makefile magic everywhere in the project. svn path=/trunk/; revision=47992
2013-02-28Export libwiretap symbols using WS_DLL_PUBLIC defineBalint Reczey1-1/+5
TODO: hide flex-generated functions svn path=/trunk/; revision=47948
2013-02-25ABI dumps don't have to depend on config.h directlyBalint Reczey1-1/+1
They depend on libs which need config.h already. svn path=/trunk/; revision=47883
2013-02-25Add dumpabi targets to CMake buildsBalint Reczey1-1/+22
Also update automake generated targets to match CMake generated ones svn path=/trunk/; revision=47879
2013-02-24Generate abi-descriptor.xml-s in CMake buildsBalint Reczey1-0/+7
svn path=/trunk/; revision=47865
2013-02-23Set library versions in CMake buildsBalint Reczey1-0/+1
svn path=/trunk/; revision=47848
2012-07-09The names "etherpeek" and "airopeek" are a bit misleading, as theGuy Harris1-2/+2
"etherpeek.c" file format is used by AiroPeek and the "airopeek9.c" file format is used by EtherPeek. Instead, use the names that WildPackets apparently uses for those formats - "classic" and "tagged". svn path=/trunk/; revision=43630
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-04-20Patch for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5048Martin Mathieson1-0/+1
From Tom Cook and Tom Alexander. 1. A VWR encapsulation that reads VeriWave capture files (*.vwr) generated from WaveTest test hardware 2. Dissectors that display the VeriWave tap headers (both 802.11 and Ethernet) 3. A dissector for the WaveAgent protocol. The WaveAgent dissector is heuristic and parses the WaveAgent packet (a UDP payload). The WaveAgent dissector has been Fuzz tested. The VWR ENCAP and dissectors have been used extensively by VeriWave customers in a special version of WireSark compiled by VeriWave. svn path=/trunk/; revision=42155
2012-03-02From Weston Schmidt: Add mpeg-ts capture file format support. ↵Anders Broman1-0/+1
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6894 svn path=/trunk/; revision=41286
2012-01-13Sync filelists between autofoo and cmake.Jörg Mayer1-1/+1
Move some dissectors that throw warnings to DIRTY_ Whitespace cleanups svn path=/trunk/; revision=40478
2011-10-26Add the code to read Aethra files.Guy Harris1-0/+1
svn path=/trunk/; revision=39592
2011-06-09- Add something to columns when using mime-encapJakub Zawadzki1-1/+1
- Replace decoders in wiretap/CMakeLists.txt svn path=/trunk/; revision=37637
2010-10-20From Hadriel Kaplan: IPFIX file format support.Bill Meier1-0/+1
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5242 svn path=/trunk/; revision=34576
2010-09-25- FindGLIB2.cmake updates fromJörg Mayer1-0/+1
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-23H.sivank:Jörg Mayer1-1/+1
Cmake fixes. svn path=/trunk/; revision=34225
2010-09-23H. Sivank <hsivank@gmail.com>Jörg Mayer1-1/+1
I try to configure Wireshark with cmake on macosx 10.6. It fails with : set_target_properties called with incorrect number of arguments. Attached a patch to fix this issue. svn path=/trunk/; revision=34201
2010-03-18cmake changes:Jörg Mayer1-0/+1
- 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
2009-11-17Beginnings of enabling static builds. Still to do:Jörg Mayer1-6/+8
* Add -static * Registration may need different handling * Add plugins * Build error in wslua svn path=/trunk/; revision=30987
2009-11-07cmake will now honor -Werror if configured (default: on)Jörg Mayer1-0/+12
svn path=/trunk/; revision=30852
2009-10-17From Marton Nemeth:Stig Bjørlykke1-0/+1
Add the ability to open JPEG/JFIF files directly. From me: Some code cleanup + add new file to cmake. svn path=/trunk/; revision=30588
2009-10-01(minor) Indent fix.Stig Bjørlykke1-3/+3
svn path=/trunk/; revision=30228
2009-09-23Build wiretap with cmake on OSX.Stig Bjørlykke1-0/+2
svn path=/trunk/; revision=30096
2009-09-23More fixes for OSX - might work now :-)Jörg Mayer1-0/+6
svn path=/trunk/; revision=30093
2009-09-08- now wireshark compiles with cmake as wellJörg Mayer1-2/+0
svn path=/trunk/; revision=29799
2009-09-02Beginnings of getting cmake to build stuff in epan.Jörg Mayer1-3/+5
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-08-30On Windows a shared library in divided into a DLL part (RUNTIME) and an ↵Kovarththanan Rajaratnam1-2/+5
import lib (ARCHIVE). svn path=/trunk/; revision=29622
2009-06-15Rename all of the ascend files:Jörg Mayer1-7/+11
That way we hopefully won't need the runlex.sh hack any more. Also the ylwrap stuff is (hopefully) obsolete. ascend.[hc] -> ascendtext.[hc] ascend-scanner.l -> ascend_scanner.l ascend-grammar.y -> ascend.y svn path=/trunk/; revision=28744
2009-05-29Resume work on CMake for Wireshark. Finally found and fixed aJörg Mayer1-37/+57
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
2006-10-24Parts of http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1179Jörg Mayer1-0/+1
Frederic Heem: * More cmake system checks. It compiles dumpcap without running configure, svn path=/trunk/; revision=19672
2006-09-05propset, add $Id: $ and copyright headersJörg Mayer1-0/+23
svn path=/trunk/; revision=19150
2006-09-05OK, as I haven't had any negative feedback, I'm adding my workJörg Mayer1-0/+40
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