From 7efe86cdde1fd8821d73e330c52145cdb786999b Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 5 Sep 2023 16:42:48 -0400
Subject: 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.
---
 indra/cmake/Python.cmake | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'indra/cmake/Python.cmake')

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)
-- 
cgit v1.2.3


From 566ace0d5694922638806d36b331479e37cb8f2b Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 8 Sep 2023 14:37:09 -0400
Subject: DRTVWR-587: Adopt Ansariel's Python.cmake Windows simplification.

---
 indra/cmake/Python.cmake | 38 +++++---------------------------------
 1 file changed, 5 insertions(+), 33 deletions(-)

(limited to 'indra/cmake/Python.cmake')

diff --git a/indra/cmake/Python.cmake b/indra/cmake/Python.cmake
index 676cf31f2f..316f49ba59 100644
--- a/indra/cmake/Python.cmake
+++ b/indra/cmake/Python.cmake
@@ -7,39 +7,11 @@ if (DEFINED ENV{PYTHON})
   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
-  foreach(hive HKEY_CURRENT_USER HKEY_LOCAL_MACHINE)
-    # prefer more recent Python versions to older ones, if multiple versions
-    # are installed
-    foreach(pyver 3.11 3.10 3.9 3.8 3.7)
-      list(APPEND regpaths "[${hive}\\SOFTWARE\\Python\\PythonCore\\${pyver}\\InstallPath]")
-    endforeach()
-  endforeach()
-
-  # TODO: This logic has the disadvantage that if you have multiple versions
-  # of Python installed, the selected path won't necessarily be the newest -
-  # e.g. this GLOB will prefer Python310 to Python311. But since pymaybe is
-  # checked AFTER the registry entries, this will only surface as a problem if
-  # no installed Python appears in the registry.
-  file(GLOB pymaybe
-    "$ENV{PROGRAMFILES}/Python*"
-##  "$ENV{PROGRAMFILES(X86)}/Python*"
-    # The Windows environment variable is in fact as shown above, but CMake
-    # disallows querying an environment variable containing parentheses -
-    # thanks, Windows. Fudge by just appending " (x86)" to $PROGRAMFILES and
-    # hoping for the best.
-    "$ENV{PROGRAMFILES} (x86)/Python*"
-    "c:/Python*")
-
-  find_program(python
-    NAMES python3.exe python.exe
-    NO_DEFAULT_PATH # added so that cmake does not find cygwin python
-    PATHS
-    ${regpaths}
-    ${pymaybe}
-    )
+  if (DEFINED ENV{VIRTUAL_ENV})
+    set(Python3_FIND_VIRTUALENV "ONLY")
+  endif()
+  find_package(Python3 COMPONENTS Interpreter)
+  set(python ${Python3_EXECUTABLE})
 else()
   find_program(python python3)
 endif (DEFINED ENV{PYTHON})
-- 
cgit v1.2.3