Merge pull request #3114 from marbre:FindPython

PiperOrigin-RevId: 342977338

Merge pull request #3114 from marbre:FindPython
PiperOrigin-RevId: 342977338
60b8906d · Gennadiy Rozental · 36d8eb53 · 826e9f25 · 60b8906d
Commit 60b8906d authored Nov 24, 2020 by Gennadiy Rozental
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

googletest/cmake/internal_utils.cmake googletest/cmake/internal_utils.cmake +7 -1

No files found.
--- a/googletest/cmake/internal_utils.cmake
+++ b/googletest/cmake/internal_utils.cmake
@@ -244,7 +244,13 @@ function(cxx_executable name dir libs)
 endfunction()

 # Sets PYTHONINTERP_FOUND and PYTHON_EXECUTABLE.
-find_package(PythonInterp)
+if ("${CMAKE_VERSION}" VERSION_LESS "3.12.0")
+  find_package(PythonInterp)
+else()
+  find_package(Python COMPONENTS Interpreter)
+  set(PYTHONINTERP_FOUND ${Python_Interpreter_FOUND})
+  set(PYTHON_EXECUTABLE ${Python_EXECUTABLE})
+endif()

 # cxx_test_with_flags(name cxx_flags libs srcs...)
 #