From 826e9f25a15e550d2a6992f5bee1f90b801178b2 Mon Sep 17 00:00:00 2001 From: Marius Brehler Date: Wed, 11 Nov 2020 16:12:11 +0100 Subject: [PATCH] Refactor finding python Use `find_package(Python ..)` if available, instead of the deprecated `find_package(PythonInterp)` CMake module. --- googletest/cmake/internal_utils.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake index b3e8b819..d6a51123 100644 --- 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...) #