Wireshark-commits: [Wireshark-commits] master-2.0 2631846: Keep CMake from finding Cygwin's Python.
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 16 Oct 2015 20:40:59 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=263184641429dbc1da6328d75479be2c60fff8b5
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

2631846 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    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@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    (cherry picked from commit 7682ae4887fbc45c8d4e3f0d8f21cd9d9093c83b)
    Reviewed-on: https://code.wireshark.org/review/11101
    

Actions performed:

    from  7b38b87   Use buttons to display the main status bar icons.
    adds  2631846   Keep CMake from finding Cygwin's Python.


Summary of changes:
 CMakeLists.txt                             |    7 +++++--
 Makefile.am                                |    1 +
 README.cmake                               |    8 +++-----
 cmake/modules/LocatePythonExecutable.cmake |   18 ++++++++++++++++++
 4 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 cmake/modules/LocatePythonExecutable.cmake