aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2013-12-13Add a "captype" file that just reports the type of a capture file, basedGuy Harris1-1/+24
on what libwiretap thinks it is. Update some comments to reflect the death of the hack used to include (libwiretap) plugin support in programs not built with libwireshark. svn path=/trunk/; revision=54015
2013-12-04Create all binaries in one directory. After running setpath.batJörg Mayer1-2/+10
wireshark etc should now work, the basic stuff at least. Known problems/todos: - The plugins are not searched for in the current directory, so find out how to let Wireshark know to search for the plugins - Other supporting files are missing (COPYING.txt, AUTHORS*, ...) - Your missing feature could be listed here ;) Ciao Jörg svn path=/trunk/; revision=53780
2013-12-02Remove /msvc2010 after ${QT5_BASE_DIR}, it should be part ofJörg Mayer1-1/+2
the QT5_BASE_DIR value. svn path=/trunk/; revision=53717
2013-12-02Move most of the plugin code from epan to wsutil and remove allGuy Harris1-8/+0
knowledge of particular types of plugins. Instead, let particular types of plugins register with the common plugin code, giving a name and a routine to recognize that type of plugin. In particular applications, only process the relevant plugin types. Add a Makefile.common to the codecs directory. svn path=/trunk/; revision=53710
2013-12-01Small style changes.Jörg Mayer1-6/+6
svn path=/trunk/; revision=53701
2013-12-01- Rename PCAP_VERSION to WINPCAP_VERSION - the version of the underlyingJörg Mayer1-3/+3
pcap probably is different from the WinPcap version. - Set WINPCAP_VERSION for cmake builds to "unknown" - Oh, the NEWS file changed again. svn path=/trunk/; revision=53690
2013-11-30Looks like the WinPcap version can only be determined from theJörg Mayer1-1/+2
name of the compressed archive - which currently means "only by manual developer intervention". svn path=/trunk/; revision=53682
2013-11-29Graham BloiceJörg Mayer1-0/+9
Ensure we use the correct value for MSC_VER_REQUIRED (similar to nmake build) svn path=/trunk/; revision=53656
2013-11-29Graham Bloice:Jörg Mayer1-0/+3
Always include the "true" zlib includes first. This works around a bug in the Windows setup of GTK[23] which has a faulty zconf.h. svn path=/trunk/; revision=53647
2013-11-24According toGuy Harris1-1/+0
http://gcc.gnu.org/onlinedocs/gcc-4.8.2/gcc/Code-Gen-Options.html#Code-Gen-Options -ftrapv "generates traps for signed overflow on addition, subtraction, multiplication operations." and -fwrapv "instructs the compiler to assume that signed arithmetic overflow of addition, subtraction and multiplication wraps around using twos-complement representation." Those seem mutually-exclusive to me, and we probably want wrapping, not traps, as there's probably a fair bit of code out there that explicitly or implicitly assumes wrapping. (Actually, we really want to avoid signed arithmetic for the cases that most matter, such as offsets and lengths, but, unfortunately, we currently have API conventions that allow negative values for lengths, either with -1 meaning "to the end" or with negative values meaning "relative to the end".) In addition, there seem to be some bugs complaining that -ftrapv doesn't always cause traps on signed integer overflow. We seem to be seeing crashes in Lemon on the Solaris buildbot subsequent to adding -ftrapv; I don't know whether that's an overflow being detected, a bug in the compiler, or something unrelated, especially given that we're using Sun C, not GCC, on the Solaris buildbot. However, we'll try removing -ftrapv, to see if it fixes the problem; the MIT CSAIL paper in question wasn't really recommending all the GCC options it mentioned (which, as noted, wouldn't make sense, as -ftrapv and -fwrapv appear to be mutually-exclusive). svn path=/trunk/; revision=53556
2013-11-24Use GCC flags to avoid optimization problems due to undefined behaviourBalint Reczey1-0/+4
Adding flags suggested by article at: http://pdos.csail.mit.edu/~xi/papers/stack-sosp13.pdf svn path=/trunk/; revision=53551
2013-11-22Add -Wheader-guard to Autotools and CMakeAlexis La Goutte1-0/+1
svn path=/trunk/; revision=53507
2013-11-18Beginnings of CheckAPI support. More diligence neededJörg Mayer1-0/+5
(need to seperate generated files into their own variables). svn path=/trunk/; revision=53407
2013-11-17Fix indent (use tabs)Alexis La Goutte1-121/+120
svn path=/trunk/; revision=53390
2013-11-17Move the epan/filesystem.c routines to wsutil; they're not specific toGuy Harris1-1/+0
packet dissection, they're specific to the entire Wireshark suite of programs. svn path=/trunk/; revision=53377
2013-11-09No need to check whether cmake_policy command exists as we requireJörg Mayer1-5/+14
cmake 2.6. Add two more policy statements to avoid warnings on current cmake systems. CMP0020 doesn't work - no idea why. svn path=/trunk/; revision=53180
2013-11-07Turn WANT_PACKET_EDITOR into an option until such a time thatJörg Mayer1-2/+0
it isn't a compile time option any more. svn path=/trunk/; revision=53147
2013-11-07Add WANT_PACKET_EDITOR to CMakeAlexis La Goutte1-0/+1
svn path=/trunk/; revision=53133
2013-11-04- Reenable /LARGEADDRESSAWARE on Windows platformJörg Mayer1-6/+14
- Add a CMAKE_BUILD_TYPE default of RelWithDebInfo (Release with debug info), print the choice. This will pick up the previously used flags LINK_FLAGS and CMAKE_C_FLAGS and CMAKE_CXX_FLAGS but also pick up the variables postfixed by _<build-type> - Remove Optimization (-O2) and debug (-g) flags from list of default flags as they are now automagically set by CMAKE_C_FLAGS_RELWITHDEBINFO etc. NOTE: This also needs to be done for the Windows flags, I just don't have a Win system to test on right now. svn path=/trunk/; revision=53083
2013-11-03Pass the name of the sed executable as an explicit argurment toJörg Mayer1-1/+1
runlex.sh (like it is done with LEX already). May fix a problem on Windows with cmake. svn path=/trunk/; revision=53059
2013-10-29Make it so out-of-tree builds (autofoo and cmake) have access to the variousJeff Morriss1-0/+2
data files (diameter/*, COPYING, manuf) when running *shark from the build directory. Do this by passing in the top-level source directory as a compile-time definition (unfortunately this has to be in the top-level Makefile too because some programs link directly with epan/filesystem.c). The plugins dir is no longer below the datafile directory but rather the progfile directory (if we have one). Handle the special case of AUTHORS-SHORT (a data file but a generated one) by checking the file name before building the path. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5664 svn path=/trunk/; revision=52940
2013-10-27Add Gettext to PACKAGELIST. Homebrew puts it in a nonstandard location.Gerald Combs1-1/+1
svn path=/trunk/; revision=52895
2013-10-16If we're using Clang add -Qunused-arguments in order to avoid a bunchGerald Combs1-2/+6
of warnings described at http://petereisentraut.blogspot.com/2011/05/ccache-and-clang.html svn path=/trunk/; revision=52646
2013-10-13Add CMake properties to targets so that they are logically organised when ↵Graham Bloice1-0/+18
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-10-12Remove some things that I added while not understanding the realJörg Mayer1-3/+4
problem/solution. "Long" since solved by copying the solution from Makefile.nmake. Small update to the status of cmake builds on windows svn path=/trunk/; revision=52574
2013-10-11With Gerald's patch we should no longer require GTK includes for QT-Only buildsJörg Mayer1-10/+0
(untested). svn path=/trunk/; revision=52555
2013-10-11The env variable is QT5_BASE_DIR, as documented in README.cmakeJörg Mayer1-1/+1
Make documentation and implementatoin consistent svn path=/trunk/; revision=52541
2013-10-11The path for the Qt5 installation now needs to be set as aJörg Mayer1-1/+1
windows environment variable. svn path=/trunk/; revision=52540
2013-10-11qtshark and wireshark(gtk2) now actually find their libs.Jörg Mayer1-5/+4
svn path=/trunk/; revision=52539
2013-10-11Now the GUI programs (wireshark/gtk2 and qtshark) compile and linkJörg Mayer1-4/+9
svn path=/trunk/; revision=52538
2013-10-10Try to locate QtMacExtras.Gerald Combs1-0/+8
svn path=/trunk/; revision=52518
2013-10-10Add Airpcap detection, use it by default on win32Jörg Mayer1-13/+38
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-10Generate setpath.bat to set the paths necessary for runningJörg Mayer1-0/+3
the generated binaries inside the build dir. svn path=/trunk/; revision=52492
2013-10-10The path approach can't work this way: Trying to set an environmentJörg Mayer1-21/+5
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-08Try to set PATH on Windows to all required dlls/libs to allowJörg Mayer1-0/+22
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-06Remove an uncommented line: The file is now part of wsutilJörg Mayer1-1/+0
svn path=/trunk/; revision=52426
2013-10-06Add a comment about PCAP_VERSIONJörg Mayer1-0/+1
svn path=/trunk/; revision=52409
2013-10-06Hack around the "/MD overridden by /MDd" messages.Jörg Mayer1-1/+1
Better solutions welcome. svn path=/trunk/; revision=52396
2013-10-05Attempt to get linking working with cmake - without success so far.Jörg Mayer1-0/+3
svn path=/trunk/; revision=52377
2013-10-04The PERL variable name is deprecated, use PERL_EXECUTABLE instead.Jörg Mayer1-4/+4
svn path=/trunk/; revision=52368
2013-09-30Don't link qtshark against portaudioJörg Mayer1-1/+0
svn path=/trunk/; revision=52283
2013-09-23Beginnings of win cmake support (not yet working), created by Graham Bloice,Jörg Mayer1-78/+105
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-10Homebrew installs gettext (including libintl, which GLib requires) inGerald Combs1-0/+7
/usr/local/opt/gettext. Tell CMake to update our include and library paths accordingly. svn path=/trunk/; revision=51943
2013-08-13Implement in cmake:Jörg Mayer1-0/+4
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-03Allow the python interpreter to be version 3 (2 being preferred)Jörg Mayer1-0/+1
svn path=/trunk/; revision=51128
2013-08-02Print the flag we are testingJörg Mayer1-0/+2
svn path=/trunk/; revision=51116
2013-08-01TShark links with libui so we should always build it.Gerald Combs1-4/+1
svn path=/trunk/; revision=51101
2013-08-01Move a bunch of the crypt modules and pint.h into wsutil.Jeff Morriss1-1/+0
This means wsutil now links against libcrypt. Protect a bunch of the crypt header files from multiple inclusion. svn path=/trunk/; revision=51100
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 01:36:30 +0000