Wireshark-commits: [Wireshark-commits] master-2.0 311dc57: Revert the last two CMake changes.
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=311dc579e8bb47042a8973d59bd7cf7252b6ec85
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark
Commits:
311dc57 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>
(cherry picked from commit 5c5cc228fc84fe2efc7528a783d1f825c396bfb2)
Reviewed-on: https://code.wireshark.org/review/11513
Actions performed:
from 72761a0 CMake: Pass ABSOLUTE to get_filename_component.
adds 311dc57 Revert the last two CMake changes.
Summary of changes:
cmake/modules/LocatePythonExecutable.cmake | 41 +++++++++-------------------
1 file changed, 13 insertions(+), 28 deletions(-)