Wireshark-commits: [Wireshark-commits] master-2.0 0f33924: FindLUA.cmake: reject version 5.3
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: Sun, 15 Nov 2015 20:41:38 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0f339246e6d7f68b0ff9f90294cf24dfe68a367d
Submitter: Bill Meier (wmeier@xxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

0f33924 by Peter Wu (peter@xxxxxxxxxxxxx):

    FindLUA.cmake: reject version 5.3
    
    Lua 5.3 could still be used when located at /usr/include/lua.h. Detect
    and reject it in that case.
    
    Rename LUA_VERSION to LUA_VERSION_NUM to avoid a conflict with
    pkg-config (which uses a different version format). Ensure that the
    regex matches a number only.
    
    Bug: 11706
    Change-Id: Idb7e3e1a8d9c6e4ab9ab1816c4dedea7de9dde8e
    Reviewed-on: https://code.wireshark.org/review/11836
    Reviewed-by: Bill Meier <wmeier@xxxxxxxxxxx>
    (cherry picked from commit 67ad1de0d06128c9eda70adb3f172c8b7ff4d6b6)
    Reviewed-on: https://code.wireshark.org/review/11848
    Petri-Dish: Bill Meier <wmeier@xxxxxxxxxxx>
    

Actions performed:

    from  03da34b   Lua: Check for nil valuestring for integer fields.
    adds  0f33924   FindLUA.cmake: reject version 5.3


Summary of changes:
 cmake/modules/FindLUA.cmake |   36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)