aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2013-07-23Use largefile detection in cmake.Jörg Mayer1-0/+4
Move wiretap/file_wrapper.c back to clean sources. svn path=/trunk/; revision=50825
2013-07-23Looks like not every version of cmake has the same behaviour wrtJörg Mayer1-1/+1
the working directory. So hardcode the path in a case where it didn't work for everyone. svn path=/trunk/; revision=50817
2013-07-22Wrap clang specific tests into a clang tests instead of checkingJörg Mayer1-11/+16
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-22Don't use the program name to identify the compiler - it won't workJörg Mayer1-2/+1
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-21Try to generate an error when calling clang with an unknown compilerJörg Mayer1-6/+13
option. This behaviour changed in clang, see https://bugzilla.mozilla.org/show_bug.cgi?id=731316 svn path=/trunk/; revision=50760
2013-07-21Enable echld builds with cmake when building with ENABLE_ECHLD=ONJörg Mayer1-0/+4
svn path=/trunk/; revision=50751
2013-07-21Don't check for "APPLE" if what you really mean is "clang"Jörg Mayer1-1/+2
svn path=/trunk/; revision=50749
2013-07-16Move merge.{h,c} into wiretap: these modules use wiretap to merge files.Jeff Morriss1-2/+0
svn path=/trunk/; revision=50656
2013-07-16Move u3.{h,c} and g711.{h,c} into wsutil.Jeff Morriss1-2/+0
Project g711.h against multiple inclusion and add C++ compatibility wrapper. svn path=/trunk/; revision=50654
2013-07-16Move strnatcmp.{h,c} from epan into wsutil: there's nothing epan-specificJeff Morriss1-2/+0
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-15Move report_err.{h,c} from epan into wsutil: there's nothing epan-specific ↵Jeff Morriss1-1/+0
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-14Don't use compiler options not supported by clang in XCode 4.6.3Michael Tüxen1-4/+8
on Apple platforms. svn path=/trunk/; revision=50576
2013-07-12Move the print modules into epan.Jeff Morriss1-13/+0
svn path=/trunk/; revision=50526
2013-07-12Move disabled_protos.{h,c} into epan.Jeff Morriss1-1/+0
svn path=/trunk/; revision=50521
2013-07-11Move some more modules into epan.Jeff Morriss1-2/+0
svn path=/trunk/; revision=50517
2013-07-11packet dissection now takes pointer to tvb instead of guint8 dataJakub Zawadzki1-0/+1
implement frame_tvbuff, right now almost a copy of 'real' tvb. svn path=/trunk/; revision=50497
2013-07-10Add strnatcmp by Martin Pool for 'natural order' string comparisons, and ↵Chris Maynard1-0/+2
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-06-27For now, don't turn on -Wcast-align by default. There are at least someGuy Harris1-1/+1
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-26Move tap-*-common.{h,c} into ui/ since that's the home for common UI functions.Jeff Morriss1-3/+1
svn path=/trunk/; revision=50165
2013-06-26Move tempfile.{h,c} into wsutil.Jeff Morriss1-3/+0
svn path=/trunk/; revision=50163
2013-06-26editcap no longer has to link against nstime.o, it's in libwsutil now.Jeff Morriss1-1/+0
svn path=/trunk/; revision=50161
2013-06-25Move a couple of time-related modules into wsutil.Jeff Morriss1-1/+0
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-01Update various warning-option lists to match what the configure scriptGuy Harris1-19/+14
adds by default. svn path=/trunk/; revision=49670
2013-06-01Move -Wlogical-op to list of standard compiler flags for c-only.Jörg Mayer1-1/+1
svn path=/trunk/; revision=49668
2013-05-22capture_unix_ifnames.c is gone.Guy Harris1-1/+1
svn path=/trunk/; revision=49490
2013-05-14Suppress warnings when using Apple's C compiler.Michael Tüxen1-2/+4
svn path=/trunk/; revision=49305
2013-05-07Move common code into UseAsn2Wrs.cmake.Jörg Mayer1-0/+1
Include the new file. Use the new file. Add cmake support to rebuild the gsm_map dissector. svn path=/trunk/; revision=49194
2013-05-01Sort the list of packages to make it easier to check results.Jörg Mayer1-0/+3
svn path=/trunk/; revision=49107
2013-05-01- Fix logic for finding packages with differing Find-nameJörg Mayer1-19/+22
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-01Our scripts do ont work with python3, so only pick up a python2Jörg Mayer1-1/+5
executable. Reported on #wireshark by McEnroe svn path=/trunk/; revision=49102
2013-04-28Fix suspected copy-and-pasteo.Guy Harris1-1/+1
svn path=/trunk/; revision=49078
2013-04-25Add Qt5 build support with cmake. Just do cmake ... -DENABLE_QT5=ON ...Jörg Mayer1-4/+20
svn path=/trunk/; revision=49042
2013-04-23Stub cmake support for generating the asn1 dissectors.Jörg Mayer1-0/+1
It doesn't do anything yet, it is just to make svn status readable again. svn path=/trunk/; revision=49007
2013-04-22Mimic autoconf behavior and enable -Wc++-compat by default.Jörg Mayer1-1/+1
svn path=/trunk/; revision=48992
2013-04-22RevertJörg Mayer1-2/+0
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=46575 User: gerald Date: 2012/12/17 01:24 PM Log: Add libui_dirty. This is the autofoo way of solving the problem. Implement the cmake solution (which is used in wiretap/ and other places) which does not require building a separate lib. svn path=/trunk/; revision=48976
2013-04-21Use -Wshadow in cmake buildsJörg Mayer1-0/+1
svn path=/trunk/; revision=48949
2013-03-06Merge asn2deb and idl2deb from official Debian packageBalint Reczey1-0/+6
svn path=/trunk/; revision=48133
2013-03-02Revert "Make Solaris Studio hide internal shared library symbols by default"Balint Reczey1-6/+1
This reverts commit r48020. svn path=/trunk/; revision=48022
2013-03-02Make Solaris Studio hide internal shared library symbols by defaultBalint Reczey1-1/+6
svn path=/trunk/; revision=48020
2013-03-01Export libwireshark symbols using WS_DLL_PUBLIC defineBalint Reczey1-11/+3
Also remove old WS_VAR_IMPORT define and related Makefile magic everywhere in the project. svn path=/trunk/; revision=47992
2013-02-28Export libwsutil symbols using WS_DLL_PUBLIC defineBalint Reczey1-1/+8
This change replaces *.def and *.sym file usage following the guideline at http://gcc.gnu.org/wiki/Visibility svn path=/trunk/; revision=47938
2013-02-25Add dumpabi targets to CMake buildsBalint Reczey1-0/+2
Also update automake generated targets to match CMake generated ones svn path=/trunk/; revision=47879
2013-02-02Reflect the move of recent.c to the ui directory.Guy Harris1-1/+0
svn path=/trunk/; revision=47439
2013-01-18Use CMAKE_VERSION for the Info.plist comment.Gerald Combs1-1/+1
svn path=/trunk/; revision=47152
2013-01-18Generate Info.plist using CMake and enable it in QtShark.pro. Update the dates.Gerald Combs1-0/+8
svn path=/trunk/; revision=47143
2012-12-21Move common time shifting code to ui/time_shift.[ch]. Change theGerald Combs1-1/+1
shifting routines to return an error message on failure or NULL on success. Prettify and simplify the layout of the GTK+ time shift dialog. Make the cancel button work as expected. Add a time shift dialog to the Qt port. I used a Mad Lib (sentence) layout. Hopefully that won't make translation too difficult. For some reason time shifts aren't immediately shown in the packet detail. This appears to be a bug in the packet list / packet detail code. Add warning role color definitions to tango_colors.h and use them. svn path=/trunk/; revision=46680
2012-12-21Use pcapio routines. This concludes the preperation forMichael Tüxen1-0/+1
adding pcapng support. svn path=/trunk/; revision=46673
2012-12-18text2pcap needs only the wsutil lib, not the wiretap lib (as far as I can see).Michael Tüxen1-1/+1
svn path=/trunk/; revision=46600
2012-12-17Add libui_dirty.Gerald Combs1-0/+2
svn path=/trunk/; revision=46575
2012-11-22We don't need Cocoa or Core Services for anything.Guy Harris1-7/+7
What we *do* need is: the Application Services framework, for GUI applications; System Configuration, for anything that would try to get interface friendly names; Core Foundation for everything that uses either of those and/or everything that displays system version information. We're currently assuming that the only Apple platform on which we build is OS X, in which case we have the OS X frameworks; update a comment. cfutils.c is part of WIRESHARK_COMMON_SRC, which is included in tshark_FILES; it doesn't need to be included in tshark_FILES. svn path=/trunk/; revision=46147