From 7682ae4887fbc45c8d4e3f0d8f21cd9d9093c83b Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Thu, 15 Oct 2015 14:45:45 -0700 Subject: 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 Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs --- Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile.am') 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 \ -- cgit v1.2.3