Wireshark · Wireshark-commits: [Wireshark-commits] master-2.0 cc501c7: Allow make-version.pl to use git when missing from path

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=cc501c727a7d1e8aea54b3dae48f6248531d0e9a
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

cc501c7 by Christian Tellefsen (chris-git@xxxxxxxxxxxxx):

    Allow make-version.pl to use git when missing from path
    
    This change allows make-version.pl to run correctly on Windows
    without having the git binary dir in PATH. This prevents problems when
    installing "Git for Windows" with default settings (git only available
    via the bundled shell (bash).
    
    Details:
    * Add Git to the list of packages to be looked up by CMake.
    * If Git is found by CMake, pass the full path to make-version.pl
    * make-version.pl: Test whether git is available, and display a warning if git is missing.
    
    On Unix-type systems this should have no impact.
    
    Tested on Windows Server 2012 R2 and Ubuntu 15.04.
    
    Change-Id: I7f7be2035c262658801586cb24c82b912848e31d
    Reviewed-on: https://code.wireshark.org/review/13111
    Reviewed-by: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    Petri-Dish: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    (cherry picked from commit adb731c1cd69855b1655a0f23001655392a07340)
    Reviewed-on: https://code.wireshark.org/review/14955
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  912d47e   [Automatic update for 2016-04-17]
    adds  cc501c7   Allow make-version.pl to use git when missing from path


Summary of changes:
 CMakeLists.txt  |    7 +++++--
 make-version.pl |   22 +++++++++++++++-------
 2 files changed, 20 insertions(+), 9 deletions(-)