diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-10-15 14:45:45 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-10-16 20:40:52 +0000 |
| commit | 263184641429dbc1da6328d75479be2c60fff8b5 (patch) | |
| tree | 183c50517416c3286994045e3ede0217957381f0 /Makefile.am | |
| parent | 7b38b87acb49e2551dfbb932ffb84318b6c2af3e (diff) | |
| download | wireshark-263184641429dbc1da6328d75479be2c60fff8b5.tar.gz | |
Keep CMake from finding Cygwin's Python.
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>
(cherry picked from commit 7682ae4887fbc45c8d4e3f0d8f21cd9d9093c83b)
Reviewed-on: https://code.wireshark.org/review/11101
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 2599639ef6..665e37e621 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1333,6 +1333,7 @@ EXTRA_DIST = \ cmake/modules/gmxTestLargeFiles.cmake \ cmake/modules/hhc.cmake \ cmake/modules/LICENSE.txt \ + cmake/modules/LocatePythonExecutable.cmake \ cmake/modules/LocatePythonModule.cmake \ cmake/modules/readme.txt \ cmake/modules/UseABICheck.cmake \ |