aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2015-11-19extcap: add sshdump.Dario Lombardo1-2/+51
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-17CMake: Add Qt5Svg to PACKAGELIST.Gerald Combs1-0/+6
...otherwise we won't copy it to ${CMAKE_BINARY_DIR}/run/Wireshark.app on OS X, which means our flag icons won't be displayed. Bug: 11697 Change-Id: I26cd6a2dd13be35f9a80fd93adc8248848df5978 Reviewed-on: https://code.wireshark.org/review/11923 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-16Revert "Override optimization and other flags for make based generators."Peter Wu1-7/+0
Some compiler flags may not be passed twice (such as -mllvm -msan-keep-going), so avoid duplicating CMAKE_C(XX)_FLAGS. When -DCMAKE_BUILD_TYPE=<type> is set, you can override the default optimization and debug flags with -DCMAKE_C_FLAGS_<type>=.... This reverts commit 15a238a28d0dbfffe908a6451e411a64a34da678. Change-Id: I4e1cf11c49eaf00ad4a2c430454a127b4be20d9e Reviewed-on: https://code.wireshark.org/review/11597 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-11-15Try retroactively applying the Qt folks' fix for QTBUG-47942.Guy Harris1-43/+27
The current version of the fix only adds -fPIC under certain circumstances; we check whether it was added and, if it was, and those circumstances are *not* in effect, we remove it. Bug: 11643 Change-Id: I75d0ff9b4781d7d4cd884a29bbce7d392939315c Reviewed-on: https://code.wireshark.org/review/11849 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-11CMake: set WinPcap version in top CMakeLists.txt file like for NMakePascal Quantin1-1/+1
This allows displaying the WinPcap version in about dialog Change-Id: Ic3f4256d81db68314a158fc55682dfd9dbf799a0 Reviewed-on: https://code.wireshark.org/review/11726 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-11-11randpkt: split into a core and an app.Dario Lombardo1-0/+1
This will allow other apps to use the random packet generation features. Change-Id: I7e9af58cbe39da4908242b5fbb292f473e03b4f2 Reviewed-on: https://code.wireshark.org/review/11579 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-06Move -fno-delete-null-pointer-checks to optionalEvan Huus1-1/+4
It is no longer supported on El Capitan's clang, which was causing my cmake/osx/qt build to fail with: clang: error: optimization flag '-fno-delete-null-pointer-checks' is not supported Change-Id: Idfac336758cdea9a34446d8281cd237ad3ee6823 Reviewed-on: https://code.wireshark.org/review/11571 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>
2015-10-29CMake: Fix compatibility with CMake 3Ryan Doyle1-1/+1
The version of CMake I use (3.2.2) failed to parse the CMakeLists.txt Change-Id: I146c5a5ba8cd6fa6236b53039a31cc085bf5b460 Reviewed-on: https://code.wireshark.org/review/11392 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-29CMake: Use CMAKE_CL_64.Gerald Combs1-1/+1
CMake sets CMAKE_CL_64 if we're using a 64-bit version of Visual Studio. Use it. Change-Id: I04595a0e703e39e428d853a506472f3881672a35 Reviewed-on: https://code.wireshark.org/review/11376 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-25Require GnuTLS 2.12.0, add cmake version detectionPeter Wu1-0/+2
Since v2.1.0rc0-17-g877fd03 and v2.0.0rc0-23-g263ff53 ("ssl-utils: load RSA keys based on their modulus+exponent"), GnuTLS 2.12.0 is needed. Add a version check to cmake as well, tested on CentOS6 (with pkg-config check disabled to verify the code path). Note that RHEL6 has GnuTLS 2.8.5 and thus SSL decryption with a RSA private key is no longer supported on that version. Change-Id: I99fdfe6790107f48629dd435794fe8880263063d Reviewed-on: https://code.wireshark.org/review/11044 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-22Pass --verbose to windeployqt.Gerald Combs1-0/+1
Change-Id: I0adc2eb294c7165b9a327a70b2437916b228f044 Reviewed-on: https://code.wireshark.org/review/11219 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-22Avoid adding -pie on older cmake versionsPeter Wu1-1/+11
Fixes building on Ubuntu 12.04 x86_64 which has cmake 2.8.7. Bug: 11617 Change-Id: I253e9fda698d4b963d50516e483d8243231f056b Reviewed-on: https://code.wireshark.org/review/11193 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-10-20Require libgcrypt 1.4.2, add cmake version detectionPeter Wu1-0/+2
libgcrypt 1.4.2 is required since since v1.11.0-rc1-2787-g23f9100 ("Really add support for AEAD ciphers (GCM)") due to the use of gcry_cipher_setctr. Bump the version in configure.ac too. Add version check for gcrypt to cmake. Tested with CentOS 6 (cmake 2.8.12.2, libgcrypt 1.4.5). Change-Id: I93c3ed902a764d9d14675779e866230d073c96d5 Reviewed-on: https://code.wireshark.org/review/11043 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-19Do -fPIC only if it's necessary.Guy Harris1-2/+46
Or, at least, undo the unconditional addition of -fPIC to Qt5Widgets_EXECUTABLE_COMPILE_FLAGS, and add it back only if we need it to compile a small test program that includes <QtCore>. -fPIC still shows up for other reasons; perhaps we need to undo other unconditional operations "helpfully" done by Qt5CoreConfigExtras.cmake. Change-Id: I76c1b01b3dce7398e4115552bc4ff87bc775e027 Reviewed-on: https://code.wireshark.org/review/11079 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-17Move the static handling to a place where it is effective during packageJoerg Mayer1-10/+10
discovery. More work needed to get static really working. v2: - Rebase - Remove accidentally added macos-setup.sh changes Change-Id: Ic3a68d2ab7064afffbf5dcfc90925699e8729780 Reviewed-on: https://code.wireshark.org/review/11082 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-10-16CMake: Add /WXGerald Combs1-8/+18
Add "/WX" to the Visual C++ compiler flags if DISABLE_WERROR is off, similar to config.nmake. We haven't compiled C++ code with -Wshorten-64-to-32 for quite some time so there's no need to add -Wno-shorten-64-to-32 in ui/qt/CMakeLists.txt. Additionally, squelch ---- C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3050) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3065) : see reference to function template instantiation 'void std::_Median<_RanIt,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3127) : see reference to function template instantiation 'std::pair<_RanIt,_RanIt> std::_Unguarded_partition<_RanIt,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3157) : see reference to function template instantiation 'void std::_Sort<_Iter,int,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Diff,_Pr)' being compiled with [ _Iter=QList<QString>::iterator , _RanIt=QList<QString>::iterator , _Diff=int , _Pr=bool (__cdecl *)(const QString &,const QString &) ] .\rpc_service_response_time_dialog.cpp(130) : see reference to function template instantiation 'void std::sort<QList<QString>::iterator,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3051) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3052) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3053) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) ---- in both rpc_service_response_time_dialog.cpp and wireshark_application.cpp so that we'll compile successfully. Change-Id: I457bcede99dcb1f3c1001f1f559c4901bb000357 Reviewed-on: https://code.wireshark.org/review/10533 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-16Keep CMake from finding Cygwin's Python.Gerald Combs1-2/+5
Try to find Python and set PYTHON_EXECUTABLE on Windows via the registry prior to calling FindPythonInterp. This works around a bug in CMake that prefers Cygwin's Python, which is a symlink, which by default is a text file that contains a Cygwin-specific cookie, which is therefore useless outside of Cygwin. This is avoids the need to pass -DPYTHON_EXECUTABLE=... to CMake. Change-Id: Ife37221b61d920682c20357b6d139a93067a5ad1 Reviewed-on: https://code.wireshark.org/review/11071 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-16Revert "Remove -fPIC with more than just MSVC."Guy Harris1-37/+2
This reverts commit 222de975c487977eafce9c6706da2221b6aa2f68. I realized how to do it with a compile test. Change-Id: I9468c50777e387c572f60411ca39ea86ba6ce520 Reviewed-on: https://code.wireshark.org/review/11078 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-16Revert "+ OR OR OR OR OR"Guy Harris1-5/+5
This reverts commit 6bdfa95a1e6ecd1b82732e7ac8513d1bba54996b. Next I'll revert my change, as I realized how I *can* do it with a compile test, instead. Change-Id: I75335ef4522af23340fdc9e5d68634cb5a5835d8 Reviewed-on: https://code.wireshark.org/review/11077 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-15+ OR OR OR OR ORJoerg Mayer1-5/+5
Change-Id: I2e6480a519bd01a924a7145bc1e4e899e3fa1c1c Reviewed-on: https://code.wireshark.org/review/11073 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-10-15Remove -fPIC with more than just MSVC.Guy Harris1-2/+37
There are other compilers that won't like it or even that may not like it. Change-Id: I0d50e4217994bc930914c0fbcf1c5d2fc18a0e3a Reviewed-on: https://code.wireshark.org/review/11072 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-15CMake: Don't feed -fPIC to Visual C++, second try.Gerald Combs1-0/+5
Qt5CoreConfigExtras.cmake in Qt 5.5.0 sets -fPIC unconditionally. Change-Id: Idf88b0f34b7cec40530702350b417ce1924db9f1 Reviewed-on: https://code.wireshark.org/review/11050 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-14cmake: avoid adding -fPIE to libraries (fixes gcc 4.7)Peter Wu1-5/+4
On Debian Wheezy, the cmake build would fail with: /usr/bin/ld: CMakeFiles/wsutil.dir/privileges.c.o: relocation R_X86_64_PC32 against symbol `started_with_special_privs' can not be used when making a shared object; recompile with -fPIC Issue was introduced with v1.99.10rc0-222-g3fb1d68 ("cmake: Enable PIE when it is available by default"). Bug: 11587 Change-Id: I62eec8d1db020128eeeb77b38e3316abf71e6e6a Reviewed-on: https://code.wireshark.org/review/10916 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-14cmake: always enable -Qunused-arguments for clangPeter Wu1-4/+4
"argument unused during compilation" warnings suggest that some options do not make sense (such as passing the -gsplit-dwarf option to the linking command while it is only valid during compilation). For now we do not care about these warnings, the option is accepted by clang and whether it used in a particular step or not is uninteresting. Change-Id: I3b6efa0dccd33c7f351c5938a29adef64ac1706d Reviewed-on: https://code.wireshark.org/review/10893 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-14If we have QtMultimedia with Qt4, add its libraries to the Qt libraries.Guy Harris1-0/+2
Change-Id: I41208287b87fba59d188e0db3bee36ee17cf3b18 Reviewed-on: https://code.wireshark.org/review/11006 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-14Add the directory for QtMultimedia to the list of include directories.Guy Harris1-0/+2
Change-Id: I670b42fcb3b8068ac9ac2809ae4445879444f554 Reviewed-on: https://code.wireshark.org/review/11000 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-14Set QT_MULTIMEDIA_LIB if we're using Qt 4 and have QtMultimedia.Guy Harris1-0/+4
Change-Id: Iee13fe86c0d8cacc71ab1cae25f4c735c5fe7b1d Reviewed-on: https://code.wireshark.org/review/10993 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-13cmake: fix kerberos library lookup, support HeimdalPeter Wu1-3/+0
A build with the gold linker broke with: run/libwireshark.so.0.0.0: error: undefined reference to 'krb5_c_decrypt' Fix this my restructuring the FindKERBEROS module to use the libraries found by pkg-config. While at it, check for MIT and Heimdal instead of assuming MIT. Remove HAVE_KEYTYPE_ARCFOUR_56 as this macro is not used. Change-Id: Iab23d79bc3f25e9c0fd7203b6f050f875fb4a2b5 Reviewed-on: https://code.wireshark.org/review/10907 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-11Back out the verbose Makefile stuff.Guy Harris1-7/+0
I give up. I don't know whether this all means our build mechanism is too fragile, our code is to fragile, autotools are too fragile, the compilers we're using are too fragile, Qt is too fragile, or C++ is too fragile, but if the build breaks that easily, maybe we should just give up on Leopard. Change-Id: If700d928da95d09ed5173b976261e4ddd236d654 Reviewed-on: https://code.wireshark.org/review/10946 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-11Temporarily make cmake builds verbose, for debugging purposes.Guy Harris1-0/+7
Try to figure out why CMake builds work on the 32-bit OS X buildbot but autotools builds don't; either the compiler commands are different in ways that break the autotools build, or the config.h files are different in ways that break the autotools build, or magic pixies affect the builds in different ways that only break the autotools build. Change-Id: Id24bad04ff8ef755e4966e28fd445c2ab05c6913 Reviewed-on: https://code.wireshark.org/review/10931 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-05Initialize 2.1.Gerald Combs1-3/+3
Change-Id: I515c53bb56cf82d1911b58f2cb2103afd0e597a5 Reviewed-on: https://code.wireshark.org/review/10810 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-05Allow use of variadic macrosPeter Wu1-0/+1
Remove variadic macros restriction (c99, c++11 feature) from README.developer. GCC, Clang, MSVC 2005 all support it. Enable -Wno-variadic-macros in configure.ac and CMakeLists.txt when -Wpedantic is enabled (which would enable -Wvariadic-macros). For all files matching 'define\s*\w+[0-9]\(', replace "FOO[0-9]" by "FOO" and adjust the macro definition accordingly. The nbap dissector was regenerated after adjusting its template and .cnf file. The generated code is the same since all files disabled the debug macros. Discussed at: https://www.wireshark.org/lists/wireshark-dev/201209/msg00142.html https://www.wireshark.org/lists/wireshark-dev/201510/msg00012.html Change-Id: I3b2e22487db817cbbaac774a592669a4f44314b2 Reviewed-on: https://code.wireshark.org/review/10781 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-02Revert "CMake: Don't feed -fPIC to Visual C++."Gerald Combs1-2/+1
This doesn't appear to fix the issue unfortunately. This reverts commit fd5eafa50a77bc319a240727600be38307e54f86. Change-Id: Ida25881fca0a667c7d47692465b8f1fc9d335697 Reviewed-on: https://code.wireshark.org/review/10753 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-02Qt: Initial RTP playback.Gerald Combs1-5/+5
Note the "initial". This is woefully incomplete. See the "to do" lists below and in the code. This differs a bit from the GTK+ version in that you specify one or more streams to be decoded. Instead of showing waveforms in individual widgets, add them all to a single QCustomPlot. This conserves screen real estate and lets us more easily take advantage of the QCP API. It also looks better IMHO. Change a bunch of checks for QtMultimediaWidgets to QtMultimedia. We probably won't use the widgets until we make 5.0 our minimum Qt version and plain old QtMultimedia lets us support Qt 4 more easily (in theory at least). Add resampling code from libspeex. I initially used this to resample each packet to match the preferred rate of our output device, but this resulted in poorer audio quality than expected. Leave it in and use to create visual samples for QCP and to match rates any time the rate changes. The latter is currently untested. Add some debugging macros. Note that both the RTP player and RTP analysis dialogs decode audio data using different code. Note that voip_calls_packet and voip_calls_init_tap appear to be dead code. To do: - Add silence frames where needed. - Implement the jitter buffer. - Implement the playback timing controls. - Tapping / scanning streams might be too slow. Change-Id: I20dd3b66d3df53c9b1f3501262dc01458849f6b4 Bug: 9007 Reviewed-on: https://code.wireshark.org/review/10458 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-02CMake: Don't feed -fPIC to Visual C++.Gerald Combs1-1/+2
Change-Id: If6dd0619052b7735d7c5eb84aadc191545df7bee Reviewed-on: https://code.wireshark.org/review/10735 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-02CMake: Fix the dmg_package target.Gerald Combs1-3/+0
We don't have Wireshark.pkgproj so don't try to copy it. Change-Id: I649fce27e53cbd45ffc50e4095252a665c49165d Reviewed-on: https://code.wireshark.org/review/10739 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-01Set the minimum Qt version to 4.7.Gerald Combs1-1/+1
We've been using QElapsedTimer for a while now with no complaints. It was introduced in Qt 4.7, which was first released in September 2010. Change-Id: I21ca768c6a7bab8a08626957583d81fd771c64b4 Reviewed-on: https://code.wireshark.org/review/10732 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-01CMake: OS X packaging updates.Gerald Combs1-8/+6
Add a dmg_package_prep target as an alias to app_bundle. Rename the osx-dmg target to dmg_package. This matches the Windows packaging target names. In osx-app.sh, make sure we rpathify the bundle plugin directory. Change-Id: If41195c9d405ad6bff865625500a8227b77e8092 Reviewed-on: https://code.wireshark.org/review/10734 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-01OS X: Integrate CMake and osx-dmg.shGerald Combs1-0/+52
Change-Id: Ide608f5e73ecd40c67a6b1c0e16f11233cd49c9d Reviewed-on: https://code.wireshark.org/review/10694 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-25CMake: Add a hardening-check target.Gerald Combs1-0/+27
On Windows, add a hardening-check target which checks for DYNAMICBASE and NXCOMPAT using the PowerShell script Get-HardenFlags.ps1. For a Visual Studio solution, run the check by calling: msbuild /m /p:Configuration=RelWithDebInfo hardening-check.vcxproj using the config as appropriate for your build. Otherwise if we find the Debian/Fedora hardening-check script add a target which runs it for each of our executables. Change-Id: I62263e81d155c66e8c8edc751ffab535bf9f3b96 Reviewed-on: https://code.wireshark.org/review/10641 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-25cmake: Enable PIE when it is available by defaultBalint Reczey1-0/+2
Change-Id: I88930b8a9de596f93677052b2046c1b85cc34c6b Reviewed-on: https://code.wireshark.org/review/10635 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-09-10Don't use any -fsanitize options unless we're using ASAN.Jeff Morriss1-5/+4
This lets cmake users configure without installing libusan. A better or more final fix awaits a decision in bug 11009. Change-Id: Iea6c4e2ce31817c17931a448f0c72da2a31a2e6d Ping-Bug: 11009 Reviewed-on: https://code.wireshark.org/review/10454 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-09-02Update comment about use of "/Zo" with MSVC2015Bill Meier1-3/+2
Change-Id: Ifb20e62a5e0719e1df2f7f6aba7a3935c7212c5b Reviewed-on: https://code.wireshark.org/review/10364 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-09-021.99.9 → 1.99.10.Gerald Combs1-1/+1
Change-Id: I924be5b0e3c73a0bb8ae1361fa518ec10139e13d Reviewed-on: https://code.wireshark.org/review/10363 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-26cmake: rework version.h handling to treat it like config.hJoerg Mayer1-20/+10
It wasn't working on my system: I kept seeing the old git revision in '...shark -v' even after deleting version.h Change-Id: I75f41a7afcee4b9384f33a56014e4af6b527fec5 Reviewed-on: https://code.wireshark.org/review/10265 Petri-Dish: Jörg Mayer <jmayer@loplof.de> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-08-13Make building with MSVC2015 workAnders1-1/+10
TODO: - LUA is commented out probably needs to be built with MSVC 2015. - GeoIP is commented out, causes packet-ip* to not build. - Qt not built, needs Qt with MSVC 2015 Change-Id: I1658077931b89b9a22ee32e5ed7de38e07fb6a55 Reviewed-on: https://code.wireshark.org/review/8683 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>
2015-08-04Convert Camel tap stats to new "generic stat API".Gerald Combs1-1/+0
Migrate the Camel stats similar to the recent BOOTP and H.225 migrations. Change-Id: If82617068ff4b8fa186899f66dc34a08585f66cb Reviewed-on: https://code.wireshark.org/review/9865 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-04Remove the CLI H.225 counter.Gerald Combs1-1/+0
Stats were moved to the dissector in g03802cc. Change-Id: I1aaf43789695ba3aae54cfaf201263cd0aed74ea Reviewed-on: https://code.wireshark.org/review/9867 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-241.99.8 → 1.99.9.Gerald Combs1-1/+1
Change-Id: I014399c332136a10b1c560d4c68be5b8bab97552 Reviewed-on: https://code.wireshark.org/review/9780 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-15Revert "On OS X, add the Qt -Wl,-rpath hack in CMake, as we do with autotools."Guy Harris1-17/+1
This reverts commit 4a39706272a59d43530e038f8b20436e2c3052ce. At least in one quick check, CMake 2.8.12.2 added that already with Qt 5.5.0. Change-Id: Iabf0e4aa0aa34b380f981f7d039fb3d95847041e Reviewed-on: https://code.wireshark.org/review/9654 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-31 01:34:33 +0000