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 commit4c03f4be00
. Revert "CMake: Look for Python using the "App Paths" key." This reverts commit6d1b6cd39d
. Change-Id: Ida17608467fa3652f4219e4eaf01edfa48120b1d Reviewed-on: https://code.wireshark.org/review/11512 Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
parent
4c03f4be00
commit
5c5cc228fc
|
@ -2,21 +2,7 @@
|
||||||
# calling FindPythonInterp in order to keep us from using Cygwin's Python.
|
# calling FindPythonInterp in order to keep us from using Cygwin's Python.
|
||||||
# http://public.kitware.com/Bug/view.php?id=13818
|
# http://public.kitware.com/Bug/view.php?id=13818
|
||||||
|
|
||||||
if(WIN32)
|
if(NOT PYTHON_EXECUTABLE AND WIN32)
|
||||||
# First check the HKLM and HKCU "App Paths" keys.
|
|
||||||
if(NOT PYTHON_EXECUTABLE)
|
|
||||||
get_filename_component(PYTHON_EXECUTABLE
|
|
||||||
"[HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\Python.exe]"
|
|
||||||
ABSOLUTE CACHE
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
if(NOT PYTHON_EXECUTABLE)
|
|
||||||
get_filename_component(PYTHON_EXECUTABLE
|
|
||||||
"[HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\Python.exe]"
|
|
||||||
ABSOLUTE CACHE
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
if(NOT PYTHON_EXECUTABLE)
|
|
||||||
foreach(_major_version 3 2)
|
foreach(_major_version 3 2)
|
||||||
foreach(_minor_version 7 6 5 4 3 2 1)
|
foreach(_minor_version 7 6 5 4 3 2 1)
|
||||||
find_program(PYTHON_EXECUTABLE
|
find_program(PYTHON_EXECUTABLE
|
||||||
|
@ -30,4 +16,3 @@ if(WIN32)
|
||||||
endforeach()
|
endforeach()
|
||||||
endforeach()
|
endforeach()
|
||||||
endif()
|
endif()
|
||||||
endif(WIN32)
|
|
Loading…
Reference in New Issue