summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-03-05 16:57:00 (GMT)
committerBrad King <brad.king@kitware.com>2014-03-05 16:58:13 (GMT)
commitbf28ff1f422407f10ecc283f03ce8c5ee57f1812 (patch)
tree6371d150ed25e3b2910b62b16ec34ad104da6a0d
parent3816cd2dc7a7cc220e4f1b1e87fee986545b9cb3 (diff)
downloadCMake-bf28ff1f422407f10ecc283f03ce8c5ee57f1812.zip
CMake-bf28ff1f422407f10ecc283f03ce8c5ee57f1812.tar.gz
CMake-bf28ff1f422407f10ecc283f03ce8c5ee57f1812.tar.bz2
FindPythonLibs: Do not try to find the interpreter (#13794)
The parent commit taught FindPythonLibs to try to find PythonInterp unconditionally. Some projects may want the libraries of a specific version even when the corresponding interpreter is not available. Drop the internal use of FindPythonInterp and just use the versions from it if it happens to have been found by the project first. That will allow projects to get a consistent version when they want both but not otherwise force them to find the interpreter.
-rw-r--r--Modules/FindPythonLibs.cmake1
1 files changed, 0 insertions, 1 deletions
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index 27d9e45..656ed7b 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -83,7 +83,6 @@ endif()
# If FindPythonInterp has already found the major and minor version,
# insert that version between the user supplied versions and the stock
# version list.
-find_package(PythonInterp QUIET)
set(_Python_VERSIONS ${Python_ADDITIONAL_VERSIONS})
if(DEFINED PYTHON_VERSION_MAJOR AND DEFINED PYTHON_VERSION_MINOR)
list(APPEND _Python_VERSIONS ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})