aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2015-01-05Override optimization and other flags for make based generators.Joerg Mayer1-0/+7
Before this patch it was not possible to override e.g. the optimization or debug flags in case the build type was set. Change-Id: I53bfddd27f87ad5482227f786af8c4728c5774fc Reviewed-on: https://code.wireshark.org/review/6327 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-04Fix out-of-tree build includes of config.hGraham Bloice1-10/+0
If a file in the same directory as config.h, e.g. wireshark-qt.cpp has a #include "config.h", or another header it includes also has a #include "config.h", then an out-of-tree build, e.g. CMake will pick up any in-tree config.h and odd things may happen. The correct form is #include <config.h> which will pick up the out-of-tree version. To find this, introduce a deliberate error and then make an out-of-tree build, noting where it fails and fix that file. If that file includes other files that still cause the build to fail, set the compiler to emit the pre-processed version so you can locate the include with the next errant "config.h". Repeat ad nauseum. Possibly all includes of "config.h" should be changed to <config.h> Revert "CMake: Clobber the top-level config.h before we build." This reverts commit 1f3849ce614aeae5fda742beffe5558e7c2a8b71. Ping-Bug: 10301 Change-Id: Ie567e7cc696fd48f3e730fc27032c5d2a7d8f341 Reviewed-on: https://code.wireshark.org/review/6285 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-03CMake: Clobber the top-level config.h before we build.Gerald Combs1-0/+10
If you use the same source directory for in-tree Autotools or Nmake builds and out-of-tree CMake builds you can end up with a conflicting config.h a the top of your source tree. Try to remove it in CMake before building our config.h Ping-Bug: 10301 Change-Id: I7ebeb31c92022fd28cbfca05fdb6931ffa2d9cae Reviewed-on: https://code.wireshark.org/review/6282 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-02tshark: Add endpoints statisticsMichael Mann1-0/+1
"stat name" has been official changed to "endpoints" for all dissectors, rather than a mixture of "host"/"endpoints" based on dissector. Change-Id: If34bcb5165b493948e784ba038ab202803a59843 Reviewed-on: https://code.wireshark.org/review/6154 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-01wireshark-qt.cpp belongs in, err, umm, the Qt Wireshark - not the GTK+ one.Guy Harris1-2/+2
Change-Id: I101be1967f45bcb56d72784a456e394ca7e51323 Reviewed-on: https://code.wireshark.org/review/6208 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01wireshark-qt.cpp is only a Qt Wireshark source file.Guy Harris1-4/+1
It's not a GTK+ Wireshark source file, so don't include it in wireshark-gtk. Change-Id: I0affa1fab1a29e10e1cf446e49182c9c4f218b87 Reviewed-on: https://code.wireshark.org/review/6203 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01Move ui/qt/main.cpp to wireshark-qt.cpp, and get rid of the dummy.cpp hack.Guy Harris1-0/+3
Change-Id: Ib4684264363593372b3bf078cf17cae1a1cb10d6 Reviewed-on: https://code.wireshark.org/review/6199 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31Move the version_info.c stuff to wsutil/ws_version_info.c.Guy Harris1-8/+0
Change-Id: I3a5c7e219974bfb924819b43b4d445eaf00e5bde Reviewed-on: https://code.wireshark.org/review/6153 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-29Windows build improvements:Graham Bloice1-1/+8
Added /Zo flag for VS2013 builds to add more debugging info Removed obsolete comment on unused /GS flag and obsolete /FR flag. Removed '#ifdef WIRESHARK_GENERATE_BSC_FILE' and related (which specified the obsolete /FR flag). Added /RELEASE flag to linker to set checksum in PE header Fixed an old typo. CMake added /INCREMENTAL:NO flag to linker to overide default and prevent warning messages. Change-Id: I039b884657d2886acc273dc6dd099d07a7b8ec7d Reviewed-on: https://code.wireshark.org/review/6110 Reviewed-by: Bill Meier <wmeier@newsguy.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-24Add -msse4.2 to the compiler flags if it's supported.Guy Harris1-0/+3
Change-Id: I354c5141f8fbe306a71395622effeb97df97f3ce Reviewed-on: https://code.wireshark.org/review/6042 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-18Use LocatePythonModule to locate asn2wrs.pyMaarten Bezemer1-1/+0
This reuses existing functionality and thereby making FindAsn2Wrs.cmake obsolete, resulting in a reduction of the cmake module maintaince load Change-Id: Ic6ae53e65236246c0cbe86f8c2f066a2d034e0b9 Reviewed-on: https://code.wireshark.org/review/5805 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-18Use LocatePythonModule to find make-dissector-reg.py in order to make ↵Maarten Bezemer1-0/+2
UseMakeDissectorReg.cmake more generally (out-of-source) usable. Add make-dissector-reg.py to the Debian packages. Making it possible to generate out-of-source wireshark plugins. Change-Id: I0bbe5b46205d39e229d31812341540b26a7336d6 Reviewed-on: https://code.wireshark.org/review/5802 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-17Install cmake files to make them available for out of source buildsMaarten Bezemer1-0/+2
Change-Id: I2cb4018f0214b6c0bdccfd1e83c7a7f22a818e8b Reviewed-on: https://code.wireshark.org/review/5256 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-17Install GLib cmake helper filesMaarten Bezemer1-0/+2
GLib is always/mostly required when building wireshark plugins. These cmake fiels help finding the install glib components Change-Id: Ie59b50bf8c53c367d4bf89f53db5ae31e97e0575 Reviewed-on: https://code.wireshark.org/review/5252 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-16Add cmake helper files for finding wiresharkMaarten Bezemer1-0/+12
These files make it possible to use the cmake command find_package(Wirehark) to obtain information about the wireshark installation. Change-Id: I5af7c4e7b53b99cd473e04905a92bac267cd9b83 Reviewed-on: https://code.wireshark.org/review/5235 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-11CMake: Make it easier to generate the release notes & NEWS.Gerald Combs1-5/+6
Add convenience targets for generating the release notes and the NEWS file. Make sure we don't run multiple instances of a2x + AsciiDoc at the same time. Add the docbook directory to the build by default unless we're running Windows. Explain why we don't yet build docs on Windows. Make each docbook makefile target optional. Split the ENABLE_GUIDES option into ENABLE_HTML_GUIDES and ENABLE_PDF_GUIDES. Add a default "all_guides" target if either is on. Remove the Debian patch that hacked around the PDF requirement. Copy ws.css to the docbook build directory. Don't build PDF release notes. I'm not sure we ever used them and I don't want to install Java and FOP just to make a release. Change-Id: Ia2f710000c17f9e0b4b514fd373d9a5902889553 Reviewed-on: https://code.wireshark.org/review/5712 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-09Qt: Initial VoIP Calls dialog.Gerald Combs1-1/+11
Add Telephony menu items for VoIP Calls and SIP Flows. Put VoIP Calls at the top, since that seems to be the primary item. Add configure-time checks for QtMultimediaWidgets in anticipation of adding a VoIP playback dialog. Add an icon for the playback button. (Yes, I've been avoiding GNOME-level gratuitous icons so far but this is one of the rare occiasions where it makes sense.) Add a help link define for the VoIP calls dialog. Change-Id: I5d0799685c598ad9af76fe9667f8ea7d14b66050 Reviewed-on: https://code.wireshark.org/review/5674 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-27LEX and YACC are requiredMaarten Bezemer1-0/+2
When building both LEX (flex) and YACC (bison or yacc) are required to generate C files from l(ex) and y(acc) files Change-Id: I8892a05eb437d0bef613b68f681225df2cb2c6b4 Reviewed-on: https://code.wireshark.org/review/5515 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-11-20Fix global plugin folder when it is set as an absolute pathBalint Reczey1-1/+5
This fixes regression in creating Debian packages caused by 80b36cdbde90ac9639938a14e8fd90a79602666a Change-Id: I46702ad4c9a11ce317da7ef664c84e1f22d3f709 Reviewed-on: https://code.wireshark.org/review/5316 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2014-11-19Remove Windows linker flags from the CMake link flags test as theGraham Bloice1-7/+5
test doesn't actually pass the flags to the VS linker. Change-Id: I5d546afcb80a49e39143078bc8f0855b0ba0f7e8 Reviewed-on: https://code.wireshark.org/review/5384 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-11-16Add unused-const-variable (enable by default on new clang release)Alexis La Goutte1-0/+1
Change-Id: I1d882e02188ba38ec1b5583c5933d0c92f0539e4 Reviewed-on: https://code.wireshark.org/review/5068 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2014-11-10Allow building under OSX Yosemite using cmake.David Ameiss1-11/+11
CFPropertyListCreateFromStream() has been deprecated in Yosemite, in favor of CFPropertyListCreateWithStream(). The autotools build checks for the existence of the new function, but the cmake build does not. So, add a check for it to CMakeLists.txt, and update cmakeconfig.h.in to provide the "template" for HAVE_CFPROPERTYLISTCREATEWITHSTREAM. Change-Id: I1a4e3e1ce83092ecf7725527b921eeca80b18d4b Note: CFPropertyListCreateWithStream() works under Mavericks as well. Reviewed-on: https://code.wireshark.org/review/5226 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-11-05Enable some runtime sanity checks when using at least gcc 4.9Joerg Mayer1-0/+5
Change-Id: I33208d4c27a27fb9222577ca176357035eeb7ba1 Reviewed-on: https://code.wireshark.org/review/5150 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-11-05Fix plugin search path: It was relative instead of absolute, resultingJoerg Mayer1-2/+1
in not found plugins (lib/wireshark/plugins/1.99.1). Change-Id: Ie81f3c4450789ff7e37c99e197b44e7df47d8df5 Reviewed-on: https://code.wireshark.org/review/5149 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-10-29Add missing stuff for custom plugins.AndersBroman1-0/+1
Change-Id: I34a35fe789d473b630b80c4f8f30833e0e04d188 Reviewed-on: https://code.wireshark.org/review/4981 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-23OS X: Integrate CMake and osx-app.shGerald Combs1-0/+37
Add a -cb/--create-bundle option to osx-app.sh which builds the application bundle. Use it in Autotools. (CMake does this by default.) Copy over linker flags from configure.ac to CMakeLists.txt to support rpathification and code signing. Add an osx-app custom target to CMake. Change-Id: I6c20a1c27f8954aaea62904b7425b9312d994803 Reviewed-on: https://code.wireshark.org/review/4918 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-15CMake: When creating a bundle add convenience symlinks.Gerald Combs1-0/+8
Change-Id: Ic6c02c8879e406b733d834e895a3ccb1e9322a9d Reviewed-on: https://code.wireshark.org/review/4696 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-11CMake: Don't add Custom.make to the bundle.Gerald Combs1-0/+1
Change-Id: I08f2701e4450f34aa9d840cc5f507e9348e115bd Reviewed-on: https://code.wireshark.org/review/4605 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-10CMake: Bundle the "share" directory files and directories.Gerald Combs1-29/+75
Work around a CMake bug using file globbing. Change-Id: I67dc8268154e05834e5d4e7d8f22c6eb25b24c1f Reviewed-on: https://code.wireshark.org/review/4595 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09CMake: Build an application bundle (Wireshark.app) on OS X.Gerald Combs1-28/+73
Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-02CMake: Don't assume we have a "cat" command.Gerald Combs1-6/+25
Use "copy /B" on Windows to create wireshark.pod, similar to doc/Makefile.nmake. Change-Id: I454afca0bd3497cca795ca18256dd7c4e2f224d4 Reviewed-on: https://code.wireshark.org/review/4415 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-22extcap: Always create extcap/ dir in run/Michal Labedzki1-0/+1
Change-Id: I5d0a2591b9086a138cefb0019f710ffb34a34c52 Reviewed-on: https://code.wireshark.org/review/3876 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-09-18Having CmakeListsCustom.txt in git defeats the purpose of its existence:Joerg Mayer1-1/+3
If it is used, there is a modified file in git. Fix this by only including the file if it exists. Other changes: - Rename the existing Custom files to CMakeListsCustom.txt.example. - Move the plugins custom file to the top level (same level as its including parent). - Optionally allow a list of custom includes instead of the default one. Change-Id: I8960eac6222f741c045055d43d1d5a2d4979caf6 Reviewed-on: https://code.wireshark.org/review/4163 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-09-17Qt: Add the "Map" button to the Endpoints dialog.Gerald Combs1-28/+46
Move the map creation code from ui/gtk/hostlist_table.c to ui/traffic_table_ui.c. Add CMake commands to copy ipmap.html to the run directory so that WIRESHARK_RUN_FROM_BUILD_DIRECTORY works for the endpoint map. Not sure if they're entirely correct but they appear to work. Add boundary checkes to geoip_db_lookup_ipv[46]. To do: - It looks like there are prettier maps and newer APIs that we might want to use. Change-Id: Ie06992c9bc9c9aa683328aecab3f5f69c9cab966 Reviewed-on: https://code.wireshark.org/review/4011 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03Actually use the define of custom plugins...AndersBroman1-0/+1
Change-Id: Id831e3bff943d9000969f951c3a2b9ead173e033 Reviewed-on: https://code.wireshark.org/review/3969 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-02Qt → wireshark. GTK+ → wireshark-gtk.Gerald Combs1-23/+23
Make sure the Qt UI is named "Wireshark" and its executable is named "wireshark" or "wireshark.exe". Make sure the GTK+ UI is named "Wireshark 1" or "Wireshark (GTK+)" depending on how much the target audience is likely to care about UI toolkits. Make sure the GTK+ executable is named "wireshark-gtk" or "wireshark-gtk.exe". It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps package. It's likely even more broken now. Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake 1.11.3) at some point. The first attempt to compile in ui/qt returns "error: source_file.cpp: No such file or directory". The second attempt works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1). Tested: - Nmake builds - NSIS packaging - CMake builds (Windows, OS X) - Autotools build and distcheck - RPM packaging To do: - Test Debian packaging - Fix PortableApps Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2 Reviewed-on: https://code.wireshark.org/review/3919 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-01Add CMake stuff for custom plugins.AndersBroman1-0/+1
Change-Id: I1eff6b902d9bd9fb8f3073ab0f4fc3dd143d0fc4 Reviewed-on: https://code.wireshark.org/review/3946 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-22Add WinSparkle to the CMake build to bring it into line withGraham Bloice1-0/+11
the nmake build Change-Id: I944d0fe15b396cad4d0054b6fc359acb42ae3c9c Reviewed-on: https://code.wireshark.org/review/3755 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-08-22Move generating HAVE_AIRPCAP to main CMakeLists.txt as is done withJoerg Mayer1-0/+3
other liberaries. Also: After set( variable 0 ) the variable is defined. Change-Id: Id26a771875b7643c19f173ce77bb29a4059a1bd0 Reviewed-on: https://code.wireshark.org/review/3793 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-21Extcap Capture InterfaceRoland Knall1-0/+14
Extcap is a plugin interface, which allows for the usage of external capture interfaces via pipes using a predefined configuration language which results in a graphical gui. This implementation seeks for a generic implementation, which results in a seamless integration with the current system, and does add all external interfaces as simple interfaces. Windows Note: Due to limitations with GTK and Windows, a gspawn-winXX-helper.exe, respective gspawn-winXX-helper-console.exe is needed, which is part of any GTK windows installation. The default installation directory from the build is an extcap subdirectory underneath the run directory. The folder used by extcap may be viewed in the folders tab of the about dialog. The default installation directory for extcap plugins with a pre-build or installer version of wireshark is the extcap subdirectory underneath the main wireshark directory. For more information see: http://youtu.be/Nn84T506SwU bug #9009 Also take a look in doc/extcap_example.py for a Python-example and in extcap.pod for the arguments grammer. Todo: - Integrate with Qt - currently no GUI is generated, but the interfaces are still usable Change-Id: I4f1239b2f1ebd8b2969f73af137915f5be1ce50f Signed-off-by: Mike Ryan <mikeryan+wireshark@lacklustre.net> Signed-off-by: Mike Kershaw <dragorn@kismetwireless.net> Signed-off-by: Roland Knall <rknall@gmail.com> Reviewed-on: https://code.wireshark.org/review/359 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-20In Visual Studio builds, enable the L4 warningGraham Bloice1-1/+2
4189: Local variable is initialized but not referenced Fix some variables found by this Change-Id: Icc13def5413f1fe885ec25e659462c8906a6cfa0 Reviewed-on: https://code.wireshark.org/review/3748 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-14CMake: More Qt5WinExtras plumbing.Gerald Combs1-0/+4
Change-Id: I7474e8373668ba554d3574193fec59daceafe00d Reviewed-on: https://code.wireshark.org/review/3588 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-13Windows Qt: Add taskbar progress supportGerald Combs1-0/+3
Add support for the taskbar progress indicator on Windows via QtWinExtras. It is almost as if we're a grown up Windows application. Change-Id: I378206b49510d4bd08f2437d8e9a1b01bc6f1351 Reviewed-on: https://code.wireshark.org/review/3576 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-07Add back a comment lost in 8b2a8a9636d090Joerg Mayer1-0/+1
Change-Id: I7bdd4767bdffdc23b964898085a216f6ef7c8aff Reviewed-on: https://code.wireshark.org/review/3474 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-05Suppress 10 of the CMP0020 CMake warnings on Windows, only 8 left now.Graham Bloice1-4/+4
Change-Id: I2f85529728e0346b8c4888cd1c23e86a306cc613 Reviewed-on: https://code.wireshark.org/review/3430 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-08-04Rip out the filetap codeEvan Huus1-6/+1
We decided at sharkfest that this wasn't the right design for file dissection; we have more-or-less settled on way forward, but nobody's shown interest in implementing it. Whether or not that ever happens, this code is effectively dead and should be removed. Change-Id: I14d6086df3204fffb6485228db39d9f407661417 Reviewed-on: https://code.wireshark.org/review/3400 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-04CMake 2.8+ supports CMAKE_OSX_DEPLOYMENT_TARGET; don't do that stuff ourselves.Guy Harris1-35/+7
Do, however, do the "for a target of 10.4 or 10.5, build 32-bit only" stuff, as that's specific to programs that capture traffic, such as Wireshark (well, I guess we could just limit it to dumpcap, but...). Change-Id: I5f4d4d57fd126e5c295dedae9ed13b263035a911 Reviewed-on: https://code.wireshark.org/review/3403 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-03Add an OSX_DEPLOY_TARGET option to control building for a target OS version.Guy Harris1-0/+53
It should be set to an OS version, such as "10.5" or "10.6" or..., and, if set (and if you're building for "APPLE"), it'll try to find the SDK (and fail if it's not found), and add appropriate -isysroot, -mmacosx-version-min, and, if appropriate, -m32 compiler options. (It will need more work once we support building OS X app bundles and installers; pick up more stuff from configure.ac for that.) Change-Id: I0aebf2db8aa39304a41be4e2a9879dea6f308ec7 Reviewed-on: https://code.wireshark.org/review/3388 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-03Go back to non-verbose Makefiles.Guy Harris1-7/+0
(The difference in question turned out to be that optimization wasn't turned on for autotools builds but was turned on for CMake builds. Comparing the compiler options also found some other differences that should be cleaned up.) Change-Id: I2edb28dedc47fe10b3f68f25d3e302430b27bf46 Reviewed-on: https://code.wireshark.org/review/3386 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-03Get rid of debugging output, and get CMake to produce verbose makefiles.Guy Harris1-8/+10
On the 32-bit OS X buildbot, automake is old enough that autotools builds are verbose, printing the command line for each compile step; if we cause CMake to produce verbose makefiles, they will also print the command line, so we can see what differences there are. This means the other debugging output we added isn't necessary; remove it. Sort the extra warning options in configure.ac based on whether they're for C and C++ or just C, just as is the case in CMake, to make it easier to keep the lists in sync; add comments to configure.ac to mirror the ones in CMakeLists.txt. Get rid of -Wno-deprecated-declarations; the CMake build doesn't use it, and it doesn't appear to be necessary - if we ever have problems with OS X complaining about using OpenSSL, for example, we should do as tcpdump does and wrap uses of the "deprecated"-but-cross-platform APIs in the appropriate pragmas. Change-Id: I0b8b45f00481ac2b67da5c7dd028a029b130dcc4 Reviewed-on: https://code.wireshark.org/review/3377 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 07:36:10 +0000