diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2023-06-30 20:16:32 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-30 20:16:32 +0300 |
| commit | 0db12fcb41b7c370f5c5093651e2732c9897ded7 (patch) | |
| tree | 01dd9d23638486031dcc49d201c35d8338091794 /indra/cmake/Python.cmake | |
| parent | 6f8b812ecd73bf25d44445e1b791f9e1b01f429f (diff) | |
| parent | 726851b039b0b0e7d623970f32b6b28616a07dc8 (diff) | |
Merge pull request #259 from secondlife/contribute-frozen
Merge ReleaseOS build into Maint U
Diffstat (limited to 'indra/cmake/Python.cmake')
| -rw-r--r-- | indra/cmake/Python.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/cmake/Python.cmake b/indra/cmake/Python.cmake index dbf5033ce5..f9259f6c2b 100644 --- a/indra/cmake/Python.cmake +++ b/indra/cmake/Python.cmake @@ -2,7 +2,11 @@ set(PYTHONINTERP_FOUND) -if (WINDOWS) +if (DEFINED ENV{PYTHON}) + # Allow python executable to be explicitly set + set(python "$ENV{PYTHON}") + set(PYTHONINTERP_FOUND ON) +elseif (WINDOWS) # On Windows, explicitly avoid Cygwin Python. # if the user has their own version of Python installed, prefer that @@ -43,7 +47,7 @@ else() if (python) set(PYTHONINTERP_FOUND ON) endif (python) -endif (WINDOWS) +endif (DEFINED ENV{PYTHON}) if (NOT python) message(FATAL_ERROR "No Python interpreter found") |