aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2017-10-21Warn the developer if we're building with GTK+.Gerald Combs1-0/+1
Move The Slowest Migration In The History Of Ever a little further along. Change-Id: Ib8b49708e7036dd412a7ffc8660ded9f681374c0 Reviewed-on: https://code.wireshark.org/review/24006 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-17CMake: increase minimum required version to 2.8.11Peter Wu1-1/+1
Due to the use of target_include_directories (when sshdump or ciscodump are enabled), the minimum required version is 2.8.11. The supported OS versions do not change, but Debian Wheezy users must enable backports. Change-Id: I883c81e5e81425ca1869f442686faf1e66a638f3 Reviewed-on: https://code.wireshark.org/review/23955 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-17CMake: fix Qt build with CMake 2.8.12 and beforePeter Wu1-28/+15
The Qt5Widgets_EXECUTABLE_COMPILE_FLAGS option is only needed for CMake before 2.8.12 and before as documented by Qt, so this ugly piece can be restricted to older CMake versions. That also helps avoiding exposing the Qt 5.5.0 in Windows since that requires a much newer CMake version. For those older versions, use COMPILE_FLAGS such that -fPIC is added after -fPIE (the latter is enabled by CMAKE_POSITION_INDEPENDENT_CODE). Tested with CMake 2.8.11, 2.8.12.2, 3.0.2 and 3.9.4 using Qt 5.9.2 and GCC 7.2.0. Change-Id: I4962f7f5a087ee5b8c79905dd3b2cce17c731bdf Fixes: v2.1.0rc0-566-gd66d379ac8 ("Try retroactively applying the Qt folks' fix for QTBUG-47942.") Reviewed-on: https://code.wireshark.org/review/23954 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-16cmake: fix CMP0026 deprecation warning in CMake 3.9Peter Wu1-22/+10
Since CMake 3.9, all policies before CMP0036 emit a warning. Fix the warning by not relying on the old behavior (existence of the LOCATION property). Tested with Ninja, the cmake output, rules.ninja and build.ninja output is identical (minus the deprecation warning). Change-Id: I058699380b01a9c02d9b98fd485ce6ded427abe3 Reviewed-on: https://code.wireshark.org/review/23915 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-16cmake: remove and reorder unused cmake policiesPeter Wu1-21/+7
Current minimum CMake version has everything up to CMP0017 enabled by default, remove older policies. CMP0011 had not effect, our link_directories are already absolute paths. Change-Id: I3af08ca75700de4a860fb4afd664824031e2c5f5 Reviewed-on: https://code.wireshark.org/review/23914 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-13CMake: Allow user build flags to override default build flagsJoão Valverde1-21/+18
Autotools has the very useful feature by design of allowing the user to override the default build flags (you break it you keep it). Apparently CMake applies COMPILE_OPTIONS target property after CMAKE_{C,CXX}_FLAGS so that doesn't work here. Prepend our flags to those variables instead to make it work then. Specific target flag overrides can still be added with COMPILER_OPTIONS (e.g: generated files with -Wno-warning) but this is less effective and then we're back at the point where this overrides user flags. It's less of a concern though. Change-Id: I44761a79be4289238e02d4e781fef0099628817b Reviewed-on: https://code.wireshark.org/review/23675 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-10-06Make osx-app.sh a configured file and remove Autotools targets.Gerald Combs1-1/+2
Rename osx-app.sh to osx-app.sh.in and add the version to the plugin path at configure time. Instead up updating Autotools accordingly just remove the macOS packaging targets. gf61c381b5a removed support for Autotools in osx-app.sh and if anyone wants to build macOS packages I'd prefer that they use the same toolchain as the buildbot. Change-Id: Ide5205265bf8859a85b1afab68fa8f8285952bd3 Reviewed-on: https://code.wireshark.org/review/23839 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-03Add version check for plugin compatibilityJoão Valverde1-2/+3
Only plugins built for the same feature release (X.Y) are assured binary compatibility. Make sure we don't try to run unsuitable code and, if so, warn the user. This might happen for example if the user manually copies a binary plugin to the wrong folder, intentionally or by accident. I'm using "release version" to loosely mean not a patch release (i.e: a feature release). Change-Id: I896e9cbbd2d3843623fff6af8ef51002ec06f1f8 Reviewed-on: https://code.wireshark.org/review/23807 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-10-01CMake: Fix extcap plugin directoryJoão Valverde1-1/+1
Fixes a338f87f33559bb9c915a97b614987736d07ff8f. Change-Id: Ib1d36a43828bd5896b327e49693485288a536342 Reviewed-on: https://code.wireshark.org/review/23805 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-01Unsplit "m2m" plugin (wimax mac-to-mac encapsulation)João Valverde1-1/+0
... not to be confused with "machine-to-machine". M2M seems to be a simple Wimax encapsulation protocol developed by Intel. It's not documented publicly anywhere that I can find. The boilerplate to code ratio is huge and it even includes a complete source file from the Wimax dissector (yuck). Put it in the Wimax plugin instead. Minor version number bump for wimax plugin. Change-Id: I2694339dfe89be334093b257a5b34d1577f4dc20 Reviewed-on: https://code.wireshark.org/review/23790 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-28Remove TPG plugin and dependenciesJoão Valverde1-15/+0
It doesn't build with autotools and CMake. Under-documented and unmaintained. Seems to be a work-in-progress that stalled. Introduces spurious CMake dependency on yapp. Change-Id: I0dca1ccbdfd683586c05765437d4b7804ab5cc70 Reviewed-on: https://code.wireshark.org/review/23758 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: Anders Broman <a.broman58@gmail.com>
2017-09-26Rename "ws_version_info.h", also .cJoão Valverde1-9/+9
It's not installed so like most other files it doesn't need or benefit from the prefix. Change-Id: I01517e06f12b3101fee21b68cba3bc6842bbef5c Reviewed-on: https://code.wireshark.org/review/23751 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-24CMake: Print build flags just before feature summaryJoão Valverde1-6/+7
Change-Id: I79cc1df1eb04c5ed9bed722f07fdea7db2adcede Reviewed-on: https://code.wireshark.org/review/23674 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-24CMake: Pretty print PACKAGELISTJoão Valverde1-1/+2
Change-Id: Ib87e0d4111f466e660435acf871036c0f1bb1555 Reviewed-on: https://code.wireshark.org/review/23673 Reviewed-by: João Valverde <j@v6e.pt>
2017-09-23plugins: Fixups for g9260461f4fJoão Valverde1-3/+2
Put plugins in CMake build dir with a version subdir. This avoids some weird special cases, however running with autotools from build dir displays the wrong global folder in about->folders. Unfortunately the hack to run from the autotools build dir is troublesome. Various fixes for Windows builds. Try to fix also build dir issue loading plugins on macOS with ENABLE_APPLICATION_BUNDLE (blind). Change-Id: Ic3c7c21f5850c12a53844202d61fa0592b45739c Reviewed-on: https://code.wireshark.org/review/23657 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-22Revert "CMake: Print a warning if CCACHE_CPP2 is unset."Gerald Combs1-4/+0
CCACHE_CPP2 / run_second_cpp is enabled by default in ccache 3.3 and later. (Unfortunately our builders have 3.2.4 installed.) This reverts commit ed1ecfb39cf0f3344810fabb7a1b855d373aa0a8. Change-Id: I3cc88fa70bb04db5ae254bc9b878ce379e47527d Reviewed-on: https://code.wireshark.org/review/23658 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-09-22CMake: Print a warning if CCACHE_CPP2 is unset.Gerald Combs1-0/+4
If we're compiling with clang and ccache, print a warning if CCACHE_CPP2 is unset. Doing so avoids generating a bunch of unwanted output when warnings are enabled. Change-Id: I6a796e8b910074ffa028ea45bc639b9461e1629e Reviewed-on: https://code.wireshark.org/review/23646 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-22Add Flow Graph functionality to TSharkMichael Mann1-0/+1
Add flow graph functionality to tshark through -z option. Output is same as ASCII format saved from GUI. Change-Id: Iee0bfea7215858e6488b4728581be28287e9ea1a Reviewed-on: https://code.wireshark.org/review/23652 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>
2017-09-21cmake: look for Qt5 from Homebrew on macOSPeter Wu1-0/+7
When Qt5 is installed using Homebrew on macOS, Qt5 is not available in the default prefix. Remove the hack from macos-setup-brew.sh and adjust the search path instead. Note that is needed for development, "brew install" has already set this option in the environment. See https://github.com/Homebrew/homebrew-core/issues/8392 Change-Id: I57ea09b649a94c9a4cb18b1b2d334808e47ec27e Reviewed-on: https://code.wireshark.org/review/23232 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-09-20CMake: fix extcaps dependency listMartin Kaiser1-3/+7
When compiling the list of dependencies for the extcaps target, add only those targets that we're actually building. If we skip an extcap, e.g. because we're missing libraries to build it, don't add this extcap to the dependency list. This issue was observed on a Debian box that had no libssh-gcrypt-dev package installed. Running cmake would create a warning about non-existent dependencies of the extcaps target. -- Configuring done CMake Warning (dev) at CMakeLists.txt:3217 (add_dependencies): Policy CMP0046 is not set: Error on non-existent dependency in add_dependencies. Run "cmake --help-policy CMP0046" for policy details. Use the cmake_policy command to set the policy and suppress this warning. The dependency target "ciscodump" of target "extcaps" does not exist. This warning is for project developers. Use -Wno-dev to suppress it. Change-Id: I7335173fce9833423b0e9443589143cc1a122ac0 Reviewed-on: https://code.wireshark.org/review/23321 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-09-17cmake: Add option to disable -Wframe-larger-thanStig Bjørlykke1-1/+1
In some editors (like Xcode) it's possible to turn on and off ASAN and UBSAN independent of the settings in CMake. This option will disable the -Wframe-larger-than= flag even if ASAN or UBSAN are not turned on in CMake. Change-Id: I70b1ae544fe87093d0f5ce7ceb191f33399191ea Reviewed-on: https://code.wireshark.org/review/23567 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-09-17plugins: Use minor version number for plugin install pathJoão Valverde1-1/+1
Wireshark patch releases (X.Y.Z) are binary compatible so reflect that in the plugin installation path. By installing to $pkglibdir/plugins/X.Y out-of-tree plugins don't need to be reinstalled with every patch release. Change-Id: I9d1728e6fb12bcb51d2a723af22c750cb7a966cf Reviewed-on: https://code.wireshark.org/review/23497 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-17plugins: Fix paths to match WSUGJoão Valverde1-0/+1
The Wireshark User Guide seems to say: Global lua plugins are in $pkglibdir/plugins Personal lua plugins are in XDG_CONFIG_HOME/plugins Global binary plugins are in $pkglibdir/plugins/$version Personal binary plugins are in XDG_CONFIG_HOME/plugins/$version Fix code to match that. This is a backward-incompatible change for global lua plugins and personal binary plugins. Adds a version subfolder to the personal plugin folder for binary plugins. This allows for safe upgrades and side-by-side installations with different prefixes (they no longer use the same personal dir). Change-Id: Ie0f039113628a257625a9a9fb2cb30e532f5dd47 Reviewed-on: https://code.wireshark.org/review/23516 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-17CMake: Initial work to install headers for the benefit of pluginsJoão Valverde1-0/+20
To be continued incrementally to fix gaps and omissions. If we are willing to reorganize the source tree to have one or two header include folders this could be simplified considerably. It would also force developers to give more consideration to API issues, which is a good thing. See also e7ef19efc0e928b50644b37772ccbf176e74f766. Bug: 14062 Change-Id: I0759da2f9793cfb5cf92c9e231457bba43df4353 Reviewed-on: https://code.wireshark.org/review/23548 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-16cmake: Add -Wcomma as a warning flag.Stig Bjørlykke1-0/+1
Change-Id: I90827ac2cd2277a969d25996392ad1627fc6c530 Reviewed-on: https://code.wireshark.org/review/23566 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-11CMake: Fix RPATH after ga338f87f33João Valverde1-2/+2
GNUInstallDirs uses lib64 on x86_64. Change-Id: I4e124a6b501bf2166e7270abbff53d52c9115f45 Reviewed-on: https://code.wireshark.org/review/23496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-08Use cmake_push_check_state() and cmake_pop_check_state().Guy Harris1-2/+6
Change-Id: I70528d5f54f62a51bf6f438669cd70d5f0296ae5 Reviewed-on: https://code.wireshark.org/review/23435 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-09-06CMake: Make plugin installation path use PLUGIN_INSTALL_LIBDIRJoão Valverde1-3/+5
Change-Id: I47f248f6ef56aba400054fa3ade2bf4d29eeb895 Reviewed-on: https://code.wireshark.org/review/23411 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-06CMake: Move CPACK remnants and remove stale commentJoão Valverde1-18/+9
Move required variables for better context. Remove TODO comment. "To do" is "everything" to re-implement CPack because (incomplete) support was dropped in g0831becc1a. Change-Id: Ie21001940794e264527f35b5d4638830de02d97e Reviewed-on: https://code.wireshark.org/review/23410 Reviewed-by: João Valverde <j@v6e.pt>
2017-09-06plugins: config.h must not be included by public headersJoão Valverde1-11/+0
For a sane plugin build environment. Include config.h as the first header in the .c file instead. Fix by moving required compiler attribute macros to a new "ws_attributes.h" API header. Change-Id: I34f58a927f68c1a0e59686c14d214825149749e1 Reviewed-on: https://code.wireshark.org/review/23400 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-03CMake: Use GNUInstallDirs module instead of our ownJoão Valverde1-1/+1
Change-Id: I42f62824f226b091ff9bb86ce5c222333f98d783 Reviewed-on: https://code.wireshark.org/review/23379 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-01CMake: prevent unnecessary rebuilds due to version.hPeter Wu1-0/+8
Ninja (but not Unix Makefiles or others) require an explicit BYPRODUCTS command to ensure that the target is executed before evaluating others. Change-Id: Iccbeb2516f7bf22ffdb444f3261ca58d22897891 Reviewed-on: https://code.wireshark.org/review/23342 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-08-30Revert "Add -Wused-but-marked-unused as an extra warning flag."Alexis La Goutte1-7/+0
This reverts commit 1aaa904622245200c179d53d638bdf256cda71ab. Change-Id: I6c783ffa40e5df9a3174cf768906e6d89ad909ef Reviewed-on: https://code.wireshark.org/review/23303 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-08-29CMake: We no longer support Visual C++ 2005 or 2008.Gerald Combs1-7/+0
Change-Id: Ide3688366aa3c38d48ff29224dbfc0fdb7bf1b7a Reviewed-on: https://code.wireshark.org/review/23277 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-28cmake: add ENABLE_NGHTTP2 optionPeter Wu1-1/+6
Allow nghttp2 to be disabled, similar to --without-nghttp2. Change-Id: Id27ab12ef7c24a535824f762ce2feb20fba9e065 Reviewed-on: https://code.wireshark.org/review/23247 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-27Add -Wused-but-marked-unused as an extra warning flag.Guy Harris1-0/+7
We can't just turn it on yet, because that would require generators to know which generated functions use which parameters and mark only the unused ones as such. The generator that turns PIDL files into DCE RPC dissectors is one that would have to be fixed. Change-Id: I7b0e9b08de6e7e9e611143de7307d3323a5c913e Reviewed-on: https://code.wireshark.org/review/23249 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-25CMake: Package list updates.Gerald Combs1-18/+12
Move gcrypt to the required package section. Fold the various xxx_REQUIRED variables into xxx_OPTIONS. Change-Id: Ib4220d7344e2bbac9062465d175921733bb0fe52 Reviewed-on: https://code.wireshark.org/review/23208 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-19Remove support for CPack.Michael Mann1-2/+28
It's very incomplete and we already have installation makers for supported OSes. Change-Id: Ide6332b9b6d69b66e7262662d781b548526ab752 Reviewed-on: https://code.wireshark.org/review/22226 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>
2017-08-17Fix some comments.Guy Harris1-2/+6
"The release mode (CMAKE_BUILD_TYPE=release) defines NDEBUG" isn't Linux-specific; it's true in the Unix Makefile generator, and possibly in other generators. (The Visual Studio generator, at least for newer versions of VS, lets you specify at *build* time what type of build to do, so the generated build files don't unconditionally define, or not define, NDEBUG, they do so based on the build type.) The RPATH stuff is done on Unix-like systems *except* for macOS. Change-Id: Ieffbaaa9a8e11a1a30b34036a2412c6735baa0c8 Reviewed-on: https://code.wireshark.org/review/23114 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-16CMake: Switch back to shipping README.txt on Windows.Gerald Combs1-3/+17
Instead of trying to ship README.md, convert its line endings and make sure the result is named README.txt. Change-Id: I4e081587c73342b01633b3a31ea03068e3fc1733 Reviewed-on: https://code.wireshark.org/review/23098 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-15Convert README to README.md.Gerald Combs1-1/+2
Convert the contents of the top-level README to Markdown and give it a .md extension. Most of our documentation is plain text or AsciiDoc, but the top-level README file in a Git repository is special in that many online browsers will show the README contents along with the directory listing and those browsers tend to favor Markdown. This is true of GitHub (which we're currently mirroring to), Gerrit via its Gitiles plugin (which we're not yet using but likely will), and other places. Add "foreign" to AM_INIT_AUTOMAKE. There is probably a joke to be made here about the FSF and border walls. Change-Id: I87c306d74864e1f0a432225b160a1b4483ee946c Reviewed-on: https://code.wireshark.org/review/23049 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-13CMake: allow CMAKE_INSTALL_RPATH to be overriddenPeter Wu1-1/+1
By default CMake sets the RPATH for built binaries to the build directory. To enable relocatable build directories, I override this RPATH as follows during development: -DCMAKE_BUILD_WITH_INSTALL_RPATH=1 -DCMAKE_INSTALL_RPATH='$ORIGIN:$ORIGIN/../extcap/..' To make work (again), do not overwrite CMAKE_INSTALL_RPATH in CMakeLists.txt. Change-Id: I7f238af07926ea706a3f999c5b1e13286ca53a66 Fixes: v2.5.0rc0-664-g55dd9b16d5 ("CMake: Update RPATH during installation.") Reviewed-on: https://code.wireshark.org/review/23062 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-12Sync some CMake and Autotools install behaviors.Gerald Combs1-8/+36
Adjust the following CMake and Autotools behaviors in order to synchronize their respective install behaviors: - Disable tfshark by default in CMakeOptions.txt - Add profiles/Bluetooth/preferences to Makefile.am - Add missing captype and ciscodump entries to doc/Makefile.am - Install help/faq.txt on all platforms in CMakeLists.txt - Add BUILD_corbaidl2wrs, BUILD_dcerpcidl2wrs, and BUILD_xxx2deb options to CMake and use them to adjust the corresponding parts of the build. - Pull the DCERPC idl2wrs build steps into the top-level CMakeLists.txt. This change doesn't sync everything. Some installed content still diverges, including the following: - CMake installs a bunch of modules into lib/wireshark: FindGLIB2.cmake FindWireshark.cmake FindWSWinLibs.cmake LocatePythonModule.cmake UseAsn2Wrs.cmake UseMakeDissectorReg.cmake WiresharkConfig.cmake WiresharkConfigVersion.cmake Do we need any or all of these? If so, should the Autotools behavior be synced accordingly? - Autotools installs libtool .la files. It also installs wireshark-gtk.desktop unconditionally. Change-Id: I7846efe08f7139c31b6ceca6f08a1fa5168b3e22 Reviewed-on: https://code.wireshark.org/review/23041 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-11CMake: Make PLUGIN_INSTALL_DIR absolute.Gerald Combs1-1/+1
CMAKE_INSTALL_LIBDIR is a relative path. Prefix it with CMAKE_INSTALL_PREFIX so that PLUGIN_INSTALL_DIR is absolute. This matches our Autotools behavior. Change-Id: Ib42cea8745615686e0c7e8473bdb1975a3b9eccd Reviewed-on: https://code.wireshark.org/review/23043 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-10CMake: Update RPATH during installation.Gerald Combs1-1/+11
If we're installing into a non-system prefix on UNIX or Linux, make sure CMake updates our RPATHs accordingly. Change-Id: Ia6eaa6533c996a8228cff25e9d2032b223781681 Reviewed-on: https://code.wireshark.org/review/23040 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-07-Wcast-align will warn about legitimate code.Guy Harris1-1/+4
Maybe there's some way to say "yes, I know that the pointer being cast is appropriately aligned", or maybe some platforms say "yes, I know, this is a struct sockaddr *, but those are aligned well enough for any other socket address types", in which case we might be able to turn that on by default in some cases. Change-Id: I6b8cff7ebfe27785b20adbbc2f855e859b090236 Reviewed-on: https://code.wireshark.org/review/22983 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-07Minor comment style tweak.Guy Harris1-0/+2
Change-Id: I58359c5a7c38e61cc7c024f1c74951679522101f Reviewed-on: https://code.wireshark.org/review/22982 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-07Sync up a bit with configure.ac.Guy Harris1-6/+27
Move -Wunused-const-variable after -Wc++-compat. Move -Wduplicated-branches after -Wdocumentation. Add some comments for the warning flags for which the configure script does a test to make sure the compiler doesn't mishandle them. Add some other comments. Change-Id: I7f648ff78eb932feef34aeccfff179bd0a2e5d49 Reviewed-on: https://code.wireshark.org/review/22980 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-07Add a comment explaining why ASan and UBSan are involved.Guy Harris1-1/+7
Change-Id: I31a429c247ed9f8efb97560d517423b0bf2d82f1 Reviewed-on: https://code.wireshark.org/review/22979 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-06Fix setting COMMON_WARN_FLAGS.Guy Harris1-8/+9
If we want to add -Wframe-larger-than=16384, *append* it, don't *overwrite* it. Indent that code properly while we're at it. Change-Id: Iae8894e6663500620a07589fd6ba3d00f9eac7ba Reviewed-on: https://code.wireshark.org/review/22977 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 06:59:00 +0000