wireshark.mpb: Out-of-source options made OS generic#48
wireshark.mpb: Out-of-source options made OS generic#48mitza-oci merged 2 commits intoDOCGroup:masterfrom
Conversation
|
Can't we just use wireshark and on Windows use the paths? Don't like that there is a special MPC feature for this |
|
This only effects Windows and macOS, where the extra parameters are necessary if you use Cmake as part of the Wireshark build. |
|
Wireshark 2.x is sufficiently different from 1.x that we will need some kind of MPC feature to indicate the difference. As we've done our testing it's become clear that wireshark.mpb must take into account which of wireshark's two different build methods are used. https://www.wireshark.org/docs/wsdg_html/#ChToolsGCC
So the CMake build method is also possible on Linux (perhaps even preferred for consistency, maybe they will drop autotools). Now instead of having the user set the MPC feature wireshark2, the user sets wireshark_cmake. |
| * config/wireshark.mpb: | ||
| * config/global.features: | ||
|
|
||
| When using Wireshark builds built using Autoconf (like Linux), |
There was a problem hiding this comment.
That's strange since I wrote this in vim set to 4 spaces for tabs.
| // Autoconf / In Source Wireshark Build Method | ||
| // This one is how the Wireshark Developers Guide says to build Wireshark on | ||
| // Linux (autogen.sh). | ||
| // This is also used for older 1.x Wireshark Windows builds. |
There was a problem hiding this comment.
... and Wireshark 2 when installed by a Linux package manager
| // WIRESHARK_BUILD | ||
| // The location of the build that the user choose when building Wireshark. | ||
| // It must contain the config.h file after building Wireshark. | ||
| // WIRESHARK_LIB |
There was a problem hiding this comment.
Since these libraries are always under WIRESHARK_BUILD, should we make it so that WIRESHARK_LIB is just the relative path?
In order to support macOS Wireshark builds, I changed wireshark.mpb to use two features,
wiresharkin source build andwireshark_cmakefor out of source builds using CMake. The structure is mostly the same otherwise, but the library location can't default based on the build location anymore.