Wireshark-commits: [Wireshark-commits] master 40a21c0: Build: On Windows, ensure we have found Cygw
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: Sat, 2 Jan 2016 22:59:14 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=40a21c0236d1ad373c42f130ace0bc5873fea373
Submitter: Graham Bloice (graham.bloice@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

40a21c0 by Graham Bloice (graham.bloice@xxxxxxxxxxxxx):

    Build: On Windows, ensure we have found Cygwin bash
    
    git can be installed (or the path manually set) so that the msys
    unix utilities supplied with git (expecially bash) are on the path
    and then picked up by CMake.  These utilities are not compatible with
    the build and will fail.
    
    This change checks the output of the --version option to the found
    executable and ensures "cygwin" is found in the result.  If not found
    a FATAL_ERROR message is issued and the CMake generation is stopped.
    
    Change-Id: I0eca014ae194862abbc8dee56d347526691e72cb
    Reviewed-on: https://code.wireshark.org/review/13008
    Petri-Dish: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    

Actions performed:

    from  3866df0   Moved variable declaration top, to be C89 compliant
    adds  40a21c0   Build: On Windows, ensure we have found Cygwin bash


Summary of changes:
 cmake/modules/FindSH.cmake |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)