Wireshark-commits: [Wireshark-commits] master 5c5cc22: Revert the last two CMake changes.

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 3 Nov 2015 01:35:36 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=5c5cc228fc84fe2efc7528a783d1f825c396bfb2
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

5c5cc22 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Revert the last two CMake changes.
    
    get_filename_component returns "/regstry" if the query is unsuccessful.
    We'll have to add a check for that if we query "Add Paths".
    
    Revert "CMake: Pass ABSOLUTE to get_filename_component."
    
    This reverts commit 4c03f4be000fd930a939b042e8d1b68c509ccebd.
    
    Revert "CMake: Look for Python using the "App Paths" key."
    
    This reverts commit 6d1b6cd39db80fe8dc77c250ae795d16ce08bf41.
    
    Change-Id: Ida17608467fa3652f4219e4eaf01edfa48120b1d
    Reviewed-on: https://code.wireshark.org/review/11512
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  4c03f4b   CMake: Pass ABSOLUTE to get_filename_component.
    adds  5c5cc22   Revert the last two CMake changes.


Summary of changes:
 cmake/modules/LocatePythonExecutable.cmake |   41 +++++++++-------------------
 1 file changed, 13 insertions(+), 28 deletions(-)