diff options
| author | Gennadiy Rozental <rogeeff@google.com> | 2020-11-24 08:46:09 (GMT) |
|---|---|---|
| committer | Gennadiy Rozental <rogeeff@google.com> | 2020-11-24 08:46:09 (GMT) |
| commit | 60b8906d1452741edc060bc0001661f00aa67a7b (patch) | |
| tree | 6712ef818e2dfef96bd879dd4cae21e5f9c6e36d /googletest/cmake/internal_utils.cmake | |
| parent | 36d8eb532022d3b543bf55aa8ffa01b6e9f03490 (diff) | |
| parent | 826e9f25a15e550d2a6992f5bee1f90b801178b2 (diff) | |
| download | googletest-60b8906d1452741edc060bc0001661f00aa67a7b.zip googletest-60b8906d1452741edc060bc0001661f00aa67a7b.tar.gz googletest-60b8906d1452741edc060bc0001661f00aa67a7b.tar.bz2 | |
Merge pull request #3114 from marbre:FindPython
PiperOrigin-RevId: 342977338
Diffstat (limited to 'googletest/cmake/internal_utils.cmake')
| -rw-r--r-- | googletest/cmake/internal_utils.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake index 2a05f01..37cf1ef 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...) # |