diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-09-05 16:42:48 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-09-05 16:42:48 -0400 |
| commit | 7efe86cdde1fd8821d73e330c52145cdb786999b (patch) | |
| tree | 735c0c069a9806779585e7faf0a5c1bff33b7c37 /indra/cmake | |
| parent | 25388312cf28f8b30934ac3885783a96a3b2ed69 (diff) | |
DRTVWR-587: Simplify Python.cmake by omitting find_package(Python3).
Elsewhere in CMake land, we reference PYTHONINTERP_FOUND and
PYTHON_EXECUTABLE, both of which are explicitly set by Python.cmake. We don't
seem to need the find_package(Python3 COMPONENTS Interpreter) call. Given that
we take some pains to be careful about which Windows Python interpreter we
find, this eliminates a wildcard.
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/Python.cmake | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/indra/cmake/Python.cmake b/indra/cmake/Python.cmake index 2167fb7864..676cf31f2f 100644 --- a/indra/cmake/Python.cmake +++ b/indra/cmake/Python.cmake @@ -40,18 +40,15 @@ elseif (WINDOWS) ${regpaths} ${pymaybe} ) - find_package(Python3 COMPONENTS Interpreter) else() find_program(python python3) - - if (python) - set(PYTHONINTERP_FOUND ON) - endif (python) endif (DEFINED ENV{PYTHON}) -if (NOT python) +if (python) + set(PYTHONINTERP_FOUND ON) +else() message(FATAL_ERROR "No Python interpreter found") -endif (NOT python) +endif (python) set(PYTHON_EXECUTABLE "${python}" CACHE FILEPATH "Python interpreter for builds") mark_as_advanced(PYTHON_EXECUTABLE) |