diff --git a/indra/cmake/Python.cmake b/indra/cmake/Python.cmake
index c8af9a528bc94935f5b3dba4224ceb7a60f07561..da5d2ef22c2e2e26973afb4212843a69fba7903c 100644
--- a/indra/cmake/Python.cmake
+++ b/indra/cmake/Python.cmake
@@ -40,15 +40,18 @@ 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 (python)
-  set(PYTHONINTERP_FOUND ON)
-else()
+if (NOT python)
   message(FATAL_ERROR "No Python interpreter found")
-endif (python)
+endif (NOT python)
 
 set(PYTHON_EXECUTABLE "${python}" CACHE FILEPATH "Python interpreter for builds")
 mark_as_advanced(PYTHON_EXECUTABLE)