49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
From 3816cd2dc7a7cc220e4f1b1e87fee986545b9cb3 Mon Sep 17 00:00:00 2001
|
|
From: Matt McCormick <matt.mccormick@kitware.com>
|
|
Date: Wed, 26 Feb 2014 21:47:20 -0500
|
|
Subject: [PATCH] FindPythonLibs: Find consistent Python interp, headers, libs
|
|
(#13794)
|
|
|
|
When possible, get consistent version of the Python interpreter, headers path,
|
|
and library.
|
|
|
|
Now find_package(PythonLibs) internally calls find_package(PythonInterp
|
|
QUIET) and uses the resulting PYTHON_VERSION_MAJOR and
|
|
PYTHON_VERSION_MINOR to prefer these versions when looking for the
|
|
header path and library. The Python_ADDITIONAL_VERSIONS variable has
|
|
priority over the interpreter version.
|
|
|
|
Co-Author: Adam Wolf
|
|
Co-Author: Gert Wollny <gw.fossdev@gmail.com>
|
|
---
|
|
Modules/FindPythonLibs.cmake | 13 +++++++++----
|
|
1 file changed, 9 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
|
|
index 0749efc..27d9e45 100644
|
|
--- a/Modules/FindPythonLibs.cmake
|
|
+++ b/Modules/FindPythonLibs.cmake
|
|
@@ -80,10 +80,15 @@ endif()
|
|
|
|
# Set up the versions we know about, in the order we will search. Always add
|
|
# the user supplied additional versions to the front.
|
|
-set(_Python_VERSIONS
|
|
- ${Python_ADDITIONAL_VERSIONS}
|
|
- ${_PYTHON_FIND_OTHER_VERSIONS}
|
|
- )
|
|
+# 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})
|
|
+endif()
|
|
+list(APPEND _Python_VERSIONS ${_PYTHON_FIND_OTHER_VERSIONS})
|
|
|
|
unset(_PYTHON_FIND_OTHER_VERSIONS)
|
|
unset(_PYTHON1_VERSIONS)
|
|
--
|
|
1.7.10.4
|
|
|