aboutsummaryrefslogtreecommitdiffstats
path: root/cmakeconfig.h.in
AgeCommit message (Collapse)AuthorFilesLines
2014-07-09CMake : Set html viewer exe path in HTML_VIEWER variable (and no set or ↵Alexis La Goutte1-1/+1
unset..), autotools only add exe name Change-Id: I552ef5d20fc80d341ce97da76b665e97df856d18 Reviewed-on: https://code.wireshark.org/review/2951 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-21Move the Windows build target OS definitions to Win XPGraham Bloice1-2/+2
This doesn't preclude use on < XP but does potentially allow use of API's that don't exist on Win2K, and doing so would then stop the exe from running on 2K. Change-Id: I08b58bd510b832ddabbb717dd73eb7a89264048e Reviewed-on: https://code.wireshark.org/review/2504 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19Make cmake build work for msvc 2013 (Graham Bloice)Joerg Mayer1-3/+3
Change-Id: I8e026dd75085723b95eb2542e102b4383379dfc8 Reviewed-on: https://code.wireshark.org/review/2469 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18Fix building uiqt on Windows with the cmake build system:Joerg Mayer1-4/+0
Protecting HAVE_PCAP_CREATE was not enough for the moc run in qt, maybe it doesn't have _WIN32 set? Don't even try to detect this function on WIN32 for now. Change-Id: I0d8a8b5b110cec164f86fe11f26a7add558eee1b Reviewed-on: https://code.wireshark.org/review/2370 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-16More Python-bindings removal.Jeff Morriss1-3/+0
Change-Id: I4d82175781e65c73179f4c8e737a7900cb050bce Reviewed-on: https://code.wireshark.org/review/2283 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-14Define INET6 for all platforms.Irene Ruengeler1-1/+3
Show the addresses as a tooltip in capture interfaces. Change-Id: I911784e09ed9479229a7d6f8a7f1476e2e1e6224 Reviewed-on: https://code.wireshark.org/review/2155 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-14Backport autofoo simd optimizationJoerg Mayer1-0/+3
Change-Id: I5d58154bf8266eabedf550b54f18845612f514c6 Reviewed-on: https://code.wireshark.org/review/2206 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-05-30Set PLUGIN_INSTALL_DIR properly for wireshark.pcBalint Reczey1-4/+1
Change-Id: I64c04095ce780ce2cc44a54a68695506d27e5747 Reviewed-on: https://code.wireshark.org/review/1861 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-17Add Bluetooth SBC Codec support in cmakeMichal Labedzki1-0/+3
SBC Codec can be optionally linked with Wireshark to provide ability to playing RTP/SBC stream by RTP Player. Change-Id: Iffbae16a741ffbfd0fb55a300064739d2c27c2e5 Reviewed-on: https://code.wireshark.org/review/223 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-01-07HAVE_PLUGINS was defined twiceJörg Mayer1-3/+0
svn path=/trunk/; revision=54627
2014-01-02Fix wireshark-qt startup coredump under autofoo and Windows: make cmake'sJeff Morriss1-3/+3
VERSION_* macros integers instead of numbers (and treat them as such in ui/qt/about_dialog.cpp). svn path=/trunk/; revision=54563
2013-11-29At least winpcap checks for WIN32 and not for _WIN32, soJörg Mayer1-1/+6
define it. This copies the behaviour of Makefile.nmake. svn path=/trunk/; revision=53643
2013-10-11We don't check for lauxlib.h or lualib.h, and we don't need to - we justGuy Harris1-6/+0
check whether we have Lua or not. Get rid of the cmakedefines for those two headers. (The autoconf script should perhaps do the check differently.) svn path=/trunk/; revision=52533
2013-10-10Move the QT_MACEXTRAS_LIB cmakedefine in cmakeconfig.h.in to theGuy Harris1-10/+11
equivalent location in config.h.in, to simplify comparing the two files. Add some tests from the autoconf script to CMake: check for setresgid() and setresuid(); check for struct stat having an st_flags member. Get rid of INTTYPES_H_DEFINES_FORMATS; we don't appear to check for it, and we don't use it (we're using GLib's formatting functions, which have their own way of handling 64-bit integers). Get rid of STDC_HEADERS; it's in autoconf because autoconf was originally developed back when you couldn't rely in ANSI C and has never been removed, and something we're using for other purposes checks for it, not because we explicitly test for it, but we don't test it in the code, and CMake doesn't even check for it. svn path=/trunk/; revision=52522
2013-10-10Try to locate QtMacExtras.Gerald Combs1-0/+3
svn path=/trunk/; revision=52518
2013-10-10Don't check for pcap_version(); we don't use it.Guy Harris1-90/+74
Sort the #cmakedefines in cmakeconfig.h.in to more closely match the order in config.h.in, to make it easier to make sure CMake and autofoo are doing the same checks. Remove some #cmakedefines that don't correspond to check that are being done either by CMake or autofoo. svn path=/trunk/; revision=52515
2013-10-10Check for bpf_image(), just as the autoconf script does.Guy Harris1-0/+3
svn path=/trunk/; revision=52514
2013-10-10HAVE_LUA is for Lua, not some particular version thereof.Guy Harris1-3/+3
Reorder to match config.h.in (which is autogenerated). svn path=/trunk/; revision=52509
2013-10-10Get rid of apparently-undefined and apparently-unused #defines.Guy Harris1-9/+0
svn path=/trunk/; revision=52508
2013-10-07NEED_STRPTIME_H needs to be detected properly for windows.Jörg Mayer1-0/+1
Set it manually for now. svn path=/trunk/; revision=52431
2013-10-06The code (at least) in dumpcap assumes that PCAP_CREATE is notJörg Mayer1-0/+4
available on Windows - but we detect it in winpcap. With this change dumpcap compiles and links svn path=/trunk/; revision=52427
2013-10-06More copying of config.h.win32 stuff into cmakeJörg Mayer1-0/+22
svn path=/trunk/; revision=52419
2013-10-06Set some values for Windows manually where autodetectionJörg Mayer1-1/+12
does not yet work. svn path=/trunk/; revision=52406
2013-10-05(Hopefully) unbreak windows build (#define'ing to 0 is notJörg Mayer1-1/+1
undefined). svn path=/trunk/; revision=52387
2013-10-05Invert NEED_INET_ATON_H to HAVE_INET_ATON_HJörg Mayer1-5/+2
Remove unused NEED_G_ASCII_STRTOULL_H svn path=/trunk/; revision=52385
2013-10-04ssize_t is missing on Windows, so typdef it.Jörg Mayer1-0/+4
svn path=/trunk/; revision=52370
2013-08-13Implement in cmake:Jörg Mayer1-0/+3
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-07-23Use largefile detection in cmake.Jörg Mayer1-0/+6
Move wiretap/file_wrapper.c back to clean sources. svn path=/trunk/; revision=50825
2013-07-16set HAVE_GETOPT_H and HAVE_GETOPT variablesMartin Kaiser1-1/+4
for both autotools and cmake builds (in order to use getopt_long(), we have to check if we can include getopt.h) svn path=/trunk/; revision=50680
2013-04-19Add HAVE_TM_ZONE and HAVE_TZNAME detection to fix timezone displayJörg Mayer1-0/+6
in cmake builds. svn path=/trunk/; revision=48932
2013-03-01Export libwireshark symbols using WS_DLL_PUBLIC defineBalint Reczey1-4/+0
Also remove old WS_VAR_IMPORT define and related Makefile magic everywhere in the project. svn path=/trunk/; revision=47992
2012-10-18Fix CMake build:Evan Huus1-5/+2
- add some new files to CMakeLists - we do need _U_ for C++ now that we're sharing some headers between C and C++. svn path=/trunk/; revision=45650
2012-09-18*NIX (autofoo and cmake) part of the fix forJeff Morriss1-0/+3
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6134 : Make VERSION_MAJOR, VERSION_MINOR, and VERSION_MICRO available in config.h so (e.g.) dissector writers can #if around them as necessary to make a piece of code compile with different versions of Wireshark. (Hopefully VERSION_MICRO is not important in this respect!) Windows also defines VERSION_EXTRA which can be used to help identify custom builds; this is not done for these build methods (yet?). svn path=/trunk/; revision=44986
2012-09-10Copy over HAVE_NL80211 from autofooJörg Mayer1-0/+3
svn path=/trunk/; revision=44853
2012-09-06Get netlink detection working with cmake (not complete)Jörg Mayer1-0/+12
svn path=/trunk/; revision=44791
2012-06-25From Tony Trinh:Anders Broman1-1/+1
Update Lua from 5.1 to 5.2 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7400 svn path=/trunk/; revision=43482
2012-06-20Complete cmake support for netlink detectionJörg Mayer1-0/+3
svn path=/trunk/; revision=43421
2012-06-20Forgot to copy one more changeJörg Mayer1-3/+0
svn path=/trunk/; revision=43417
2012-06-19Do the changes to configure from r43354 in cmake as well.Jörg Mayer1-0/+3
Log: Start to have an generic wireless toolbar. Sligtly modified patch from Pontus Fuchs. svn path=/trunk/; revision=43361
2012-02-02- Move setting _U_ into config.h, becauseJörg Mayer1-0/+7
a) C++ has a standardized way of marking parameters as unused b) cmakes autoquoting magic failed when the compiler wasn't gcc but moc instead. - qtshark: Don't try to compile the c source files inside ui/qt/ - qtshark: Only run moc on the files that need it. - qtshark: It's too early to try any of the new qtshark files as clean. - Make Qt detection actually work - Add C++ to the list of languages for this project svn path=/trunk/; revision=40807
2011-11-07Change the use of threads from "mostly always, depending on yourGerald Combs1-3/+0
configure options and Gtk+ and GLib versions" to "always". svn path=/trunk/; revision=39751
2011-10-08Mimic test for IPv6 support in GeoIP from autofooJörg Mayer1-0/+3
svn path=/trunk/; revision=39307
2011-08-23Remove support for libpcre, we use GRegex in GLib.Stig Bjørlykke1-3/+0
svn path=/trunk/; revision=38683
2011-08-09Copy over the commit 38437 to cmake.Jörg Mayer1-1/+1
svn path=/trunk/; revision=38438
2011-08-06Get rid of HAVE_PCAP_SET_BUFFER_SIZE - nobody checks forGuy Harris1-3/+0
pcap_set_buffer_size() (if *pcap has pcap_create() it has pcap_set_buffer_size(), as they were both introduced in libpcap 1.0.0), and nobody looks at HAVE_PCAP_SET_BUFFER_SIZE. svn path=/trunk/; revision=38382
2011-08-02Define PACKAGE in config.h.Gerald Combs1-0/+3
svn path=/trunk/; revision=38316
2011-07-21Make USE_THREADS actually work with cmakeJörg Mayer1-0/+3
svn path=/trunk/; revision=38138
2011-07-06Add detection of rpcap support in libpcap and use it if available.Jörg Mayer1-0/+4
svn path=/trunk/; revision=37914
2011-06-28Replace all strerror() with g_strerror().Stig Bjørlykke1-3/+0
Remove our local strerror implementation. Mark strerror as locale unsafe API. This fixes bug 5715. svn path=/trunk/; revision=37812
2011-06-17Add configure options to make change the default file formatJörg Mayer1-0/+3
from pcap-ng to pcap. Add a comment that GTK3 doesn't build yet. svn path=/trunk/; revision=37701