Commit Graph

3 Commits

Author SHA1 Message Date
Peter Wu 3cc0cfc48c CMake: try harder to find the right Python version
The FindPythonInterp module does not verify that a discovered 'python'
program is actually Python 3. Replace this deprecated module by a modern
version that was introduced with CMake 3.12.

Remove PYTHON_EXECUTABLE from WSDG now that it is much more likely that
CMake discovers the right version.

Change-Id: I1f8438baced3d5bf9e1e2732980ad177d3257ca3
Reviewed-on: https://code.wireshark.org/review/31468
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-10 06:42:08 +00:00
Peter Wu fda12fb66d Fix Python 3 compatibility in LocatePythonModule
Regression introduced with cb345eb4bd.

Change-Id: I625432ac4572d2449cb6981a158e46c560a81f1a
Reviewed-on: https://code.wireshark.org/review/5883
Reviewed-by: Maarten Bezemer <maarten.bezemer@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-21 08:54:24 +00:00
Maarten Bezemer cb345eb4bd Use LocatePythonModule to find make-dissector-reg.py in order to make 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-18 07:42:39 +00:00