aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeOptions.txt
AgeCommit message (Collapse)AuthorFilesLines
2016-03-21Remove ADNS supportJoão Valverde1-1/+0
Relevant mailing list message: https://www.wireshark.org/lists/wireshark-dev/201503/msg00007.html Change-Id: I0cff6d4d64fb52a651bcf6b28c183e43653b1cc2 Reviewed-on: https://code.wireshark.org/review/14519 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-07Add conflict check filterAlexis La Goutte1-0/+1
Set ENABLE_CHECK_FILTER to 1 for get list of display filter with conflict... Ping-Bug:2402 Change-Id: I8d56b1573120d1a29d437aae1088be242e15e9a3 Reviewed-on: https://code.wireshark.org/review/13644 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> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-22extcap: add randpktdump, a random packet generator.Dario Lombardo1-0/+1
This new extcap is for testing and educational purpose. It relies on rankpkt-core functions to generate random packets. Change-Id: If6890f0673545682995a2079458108edc0913b30 Reviewed-on: https://code.wireshark.org/review/11764 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>
2015-11-19extcap: add sshdump.Dario Lombardo1-0/+1
sshdump is an extcap module that allows dumping from a remote host using an ssh connection. It goes with the existing extcap plugin interface. Change-Id: I8987614fdd817b8173a50130812bc643a4833bca Reviewed-on: https://code.wireshark.org/review/11402 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-10Apple calls it just "OS X" these days.Guy Harris1-2/+2
Change-Id: I98905988ceb394d27307d1cbe883d8fe95ac23e4 Reviewed-on: https://code.wireshark.org/review/11703 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-08extcap: Add support for Android - androiddumpMichal Labedzki1-0/+2
androiddump is extcap program that can be used with Android devices (need Android SDK in system PATH). Supported is Logcat/Logger logs and Bluetooth interfaces for all Android to this day (Lollipop). Please note that it will work also for FirefoxOS. Interfaces: 1. Logcat Main (binary or text) 2. Logcat System (binary or text) 3. Logcat Events (binary or text) 4. Logcat Radio (binary or text) 5. Logcat Crash (text; Lollipop) 6. Bluetooth Hcidump (<Kitkat) 7. Bluetooth Bluedroid External Parser (Kitkat) 8. Bluetooth BtsnoopNet (Lollipop) Change-Id: I26e4cd1a37a6af805f8b932399b4aa44ee7b5a80 Reviewed-on: https://code.wireshark.org/review/7475 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-18Add AddressSanitizer (ASAN) build optionAlexis La Goutte1-0/+1
--enable-asan for autotools -D ENABLE_ASAN:BOOL=TRUE for CMake Need Clang/LLVM >= 3.1 or GCC >= 4.9 More information about ASAN https://code.google.com/p/address-sanitizer/wiki/AddressSanitizer Change-Id: I833d4216d9508b8f7550ebc1dff6326734bdb53a Reviewed-on: https://code.wireshark.org/review/1727 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-08CMake: Enable DocBook on Windows.Gerald Combs1-0/+1
Add a wrapper script and CMake macros which lets us run Cygwin's a2x from Windows. Add *another* wrapper script that ignores the return value of hhc.exe. Move the ASCIIDOC2DOCBOOK macro to FindASCIIDOC.cmake. Add FindHHC.cmake. Add hints to FindFOP.cmake. Use unique file names in the HTML Help chain in an attempt to avoid a race condition. To do: - Fix curly quote in HHC title. Change-Id: I9b154b7fbd02703656e2ab380199ec0a6db4e36d Reviewed-on: https://code.wireshark.org/review/6379 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06CMake: Add an ENABLE_CODE_ANALYSIS option.Gerald Combs1-0/+2
Currently Visual Studio-only. Enabling it adds /analyze:WX- to LOCAL_CFLAGS, similar to config.nmake. Change-Id: Ida68831e85f5f04b9f84faa95a39fed24e5f490d Reviewed-on: https://code.wireshark.org/review/6346 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-05Note why we only default to enabling libnl on Linux.Guy Harris1-0/+3
(Just as we note why we only check for it on Linux in autotools.) Change-Id: I58c1f31fdf667ed554a4e911df13e5c864171ac0 Reviewed-on: https://code.wireshark.org/review/6315 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-15cmake: Do not hide possible options for other platformsMichal Labedzki1-0/+2
Change-Id: I408620cb39a25a4104e9ea562f6512f4196ae32f Reviewed-on: https://code.wireshark.org/review/5766 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-11CMake: Make it easier to generate the release notes & NEWS.Gerald Combs1-1/+2
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-10-09CMake: Build an application bundle (Wireshark.app) on OS X.Gerald Combs1-0/+5
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-09-02Qt → wireshark. GTK+ → wireshark-gtk.Gerald Combs1-18/+17
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-08-24Add captype to the CMake options so it gets built if requiredGraham Bloice1-0/+1
Change-Id: I915a7caa32a1f644c30c1579a8ad15e39db9e02a Reviewed-on: https://code.wireshark.org/review/3799 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-08-22Add WinSparkle to the CMake build to bring it into line withGraham Bloice1-0/+5
the nmake build Change-Id: I944d0fe15b396cad4d0054b6fc359acb42ae3c9c Reviewed-on: https://code.wireshark.org/review/3755 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-08-21Extcap Capture InterfaceRoland Knall1-0/+1
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-06-18Undo more of Graham's changes:Joerg Mayer1-16/+3
- We don't expect to find all packages and it is normally OK for some to fail. Change-Id: I46c5edbf8ea3635fd703b222d4a9beb5ebb4745a Reviewed-on: https://code.wireshark.org/review/2406 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-17Remove detection of Python libraries: They are not used anymore.Joerg Mayer1-1/+0
Change-Id: If42bb16d5c6202889ff933af6c9d974866d2a950 Reviewed-on: https://code.wireshark.org/review/2290 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-08Update CMake build for win32 to build QT again, and to findGraham Bloice1-3/+16
GLib and GThread libs Change-Id: If7e8ebc46f42389d174959303e13cde20687ae8a Reviewed-on: https://code.wireshark.org/review/2010 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-05libnl is a Linux-specific library; don't offer libnl support except on Linux.Guy Harris1-1/+3
Change-Id: I79a98d1f9b3559fe76feed1038d673dd3424409c Reviewed-on: https://code.wireshark.org/review/1515 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-29Set CMake defaults for Windows build to:Graham Bloice1-1/+8
Use GTK2 as per nmake. Not to build the dumpabi executables. Change-Id: Ia28cf1a80b81e10595f4af5bbd46da3b3675faf5 Reviewed-on: https://code.wireshark.org/review/1376 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-20Rename ENABLE_EXTRA_COMPILER_CHECKS to ENABLE_EXTRA_COMPILER_WARNINGS.Guy Harris1-2/+2
This matches the current name of the --enable-extra-compiler-warnings option in autotools. Fix the documentation of the option to match. (Note that "compiler" won't necessarily always be GCC or Clang, and won't necessarily always use -W for warning options, so speaking of them as "-W checks" isn't future-proof.) Change-Id: I2e142532e78be3c8051f1e738b3109a83e7d10dc Reviewed-on: https://code.wireshark.org/review/1231 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-20Rename ENABLE_EXTRA_GCC_CHECKS to ENABLE_EXTRA_COMPILER_CHECKS.Guy Harris1-1/+1
This matches with the change made to CMakeLists.txt. Change the description as well - the name was changed because those extra checks don't just apply to GCC. Change-Id: Id81c081574c42e11144d119c8af45875248578b5 Reviewed-on: https://code.wireshark.org/review/1229 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-20Get rid of ENABLE_EXTRA_CLANG_CHECKS.Guy Harris1-1/+0
It no longer does anything, and it refers to variables that no longer exist, as we're not distinguishing between extra GCC warning flags and extra CLang warning flags any more. Change-Id: If0b346f669f2573e46261e6da4dc78e96ef79a8f Reviewed-on: https://code.wireshark.org/review/1228 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Add --enable-extra-clang-checks for autotools and CMakeListAlexis La Goutte1-0/+1
With -Wunreachable-code flags (and disable for the moment -Wdocumentation) Change-Id: I126c962b32e650a63b78092e95896736ae7335c9 Reviewed-on: https://code.wireshark.org/review/678 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-17Add Bluetooth SBC Codec support in cmakeMichal Labedzki1-0/+1
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-19Add option to specify special permissions for dumpcap during cmake phase:Jörg Mayer1-0/+5
set(DUMPCAP_INSTALL_OPTION <val>) where val is one of "normal" "suid" "capabilities" Some things left to do: - Error out in cmake if setcap isn't found or libcap isn't found. - Move multivalue option handling into it's own macro (-file) with value checking svn path=/trunk/; revision=54840
2014-01-08TFShark (Terminal Fileshark) v.001. Bug 9607 ↵Michael Mann1-0/+1
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607) This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it) This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!). svn path=/trunk/; revision=54646
2013-11-07Turn WANT_PACKET_EDITOR into an option until such a time thatJörg Mayer1-0/+1
it isn't a compile time option any more. svn path=/trunk/; revision=53147
2013-10-10Add Airpcap detection, use it by default on win32Jörg Mayer1-1/+5
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-10Build qtshark by default, use qt5 by default. To turnJörg Mayer1-2/+2
off building qtshark do "cmake ... -DBUILD_qtshark=OFF ..." or change your local copy of CMakeOptions.txt Small update to README.cmake (when running nmake I recommend using /X- to avoid some (viewing) corruptions. svn path=/trunk/; revision=52501
2013-07-24Change default gtk build from version 2 to version 3 forJörg Mayer1-1/+1
autotool, cmake and nmake. No idea what it takes to change the visual project stuff svn path=/trunk/; revision=50863
2013-07-23Clean up capitalization in some option descriptions.Guy Harris1-9/+9
svn path=/trunk/; revision=50850
2013-07-21Add option for echld builds (forgot that in a previous commit)Jörg Mayer1-0/+1
svn path=/trunk/; revision=50759
2013-04-25Add Qt5 build support with cmake. Just do cmake ... -DENABLE_QT5=ON ...Jörg Mayer1-1/+2
svn path=/trunk/; revision=49042
2012-09-24From Jim Young, bug 7745.Martin Mathieson1-0/+1
Add Makefile support for reordercap. svn path=/trunk/; revision=45090
2012-09-06Get netlink detection working with cmake (not complete)Jörg Mayer1-1/+1
svn path=/trunk/; revision=44791
2012-06-20Complete cmake support for netlink detectionJörg Mayer1-0/+1
svn path=/trunk/; revision=43421
2012-02-02Prepare the cmake infrastucture for eventually buildingJörg Mayer1-1/+2
wireshark and qtshark simultanously. The "only" missing thing for this is now ui/qt/CMakeLists.txt ;) svn path=/trunk/; revision=40799
2012-01-20Bug 6448 says the embedded Python stuff does not really work.Jeff Morriss1-1/+1
And if I run Valgrind with Python enabled, I get pages of errors related to it. So: disable Python by default. svn path=/trunk/; revision=40602
2011-11-07Change the use of threads from "mostly always, depending on yourGerald Combs1-2/+0
configure options and Gtk+ and GLib versions" to "always". svn path=/trunk/; revision=39751
2011-09-25Get rid of (hopefully) all configure options to enable MAIN_MENU_USE_UIMANAGERJörg Mayer1-2/+1
as it is the only option left. svn path=/trunk/; revision=39138
2011-08-30Make it possible to disable building with libpcap.Jörg Mayer1-0/+1
svn path=/trunk/; revision=38795
2011-08-23Remove support for libpcre, we use GRegex in GLib.Stig Bjørlykke1-1/+0
svn path=/trunk/; revision=38683
2011-08-22Fix a typoJörg Mayer1-1/+1
svn path=/trunk/; revision=38663
2011-08-22Rename UI_MANAGER to ENABLE_UI_MANAGER, put it intoJörg Mayer1-1/+2
CMakeOptions and enable it by default. Update comment in proto_help that this feature is no longer built by default. Enable PYTHON by default. svn path=/trunk/; revision=38659
2011-07-16Add option for USE_THREADS.Michael Tüxen1-0/+1
svn path=/trunk/; revision=38061
2011-07-12Add a comment noting why AirPcap support cannot be unconditionallyGuy Harris1-1/+7
enabled by default (i.e., it's Windows-only). InterCap the name. svn path=/trunk/; revision=37992
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 17:30:49 +0000