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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7f5c5e4ae7086448037423f61548bb7d9f48278c
Submitter: "Gerald Combs <gerald@xxxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

7f5c5e4 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    CMake: Fix config.nsh generation.
    
    Make sure we always define VERSION_MINOR.
    
    Change-Id: I4a79c6d25c1392834703d9ab3cbab2c0f9794ac5
    Reviewed-on: https://code.wireshark.org/review/31886
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    (cherry picked from commit 2c77f8899ce145a41ede5e848c67ba6cdef31b47)
    Reviewed-on: https://code.wireshark.org/review/31887
    

Actions performed:

    from  68efe64   make-version.pl: Fix version variable checks.
     add  7f5c5e4   CMake: Fix config.nsh generation.


Summary of changes:
 packaging/nsis/CMakeLists.txt |  1 -
 packaging/nsis/config.nsh.in  | 50 +++++++++++++++++++++----------------------
 2 files changed, 24 insertions(+), 27 deletions(-)