Wireshark-commits: [Wireshark-commits] master-2.0 1ef2f21: CMake+NSIS: Fix our minor version.
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: Mon, 5 Oct 2015 23:07:40 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=1ef2f21c2132295ecb33dee3f506798c147d5c58
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

1ef2f21 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    CMake+NSIS: Fix our minor version.
    
    CMake's configure_file command helpfully undefs any zero value. Our
    minor version is zero. Feed it "#cmakedefine01 MINOR_VERSION" to
    compensate. Remove a previous workaround that didn't work.
    
    Change-Id: I28d1ecd21b3c87d0a80301100bef207b4e10f034
    Reviewed-on: https://code.wireshark.org/review/10818
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  37dbded   Add BASE_PT_ field display types
    adds  1ef2f21   CMake+NSIS: Fix our minor version.


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