|
Line
Link Here
|
| 0 |
-- cmake/modules//FindPythonLibs.cmake |
0 |
++ cmake/modules/FindPythonLibs.cmake |
|
Lines 17-24
Link Here
|
| 17 |
|
17 |
|
| 18 |
IF(WIN32) |
18 |
IF(WIN32) |
| 19 |
FIND_LIBRARY(PYTHON_DEBUG_LIBRARY |
19 |
FIND_LIBRARY(PYTHON_DEBUG_LIBRARY |
| 20 |
NAMES python26_d python25_d python24_d python23_d python22_d python21_d python20_d python |
20 |
NAMES python27_d python26_d python25_d python24_d python23_d python22_d python21_d python20_d python |
| 21 |
PATHS |
21 |
PATHS |
|
|
22 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]/libs/Debug |
| 23 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]/libs |
| 22 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs/Debug |
24 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs/Debug |
| 23 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs |
25 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs |
| 24 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs/Debug |
26 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs/Debug |
|
Lines 41-47
Link Here
|
| 41 |
ENDIF(WIN32) |
43 |
ENDIF(WIN32) |
| 42 |
|
44 |
|
| 43 |
FIND_LIBRARY(PYTHON_LIBRARY ${PREFERRED_PYTHON_VERSION} |
45 |
FIND_LIBRARY(PYTHON_LIBRARY ${PREFERRED_PYTHON_VERSION} |
| 44 |
NAMES python26 python2.6 |
46 |
NAMES python27 python2.7 |
|
|
47 |
python26 python2.6 |
| 45 |
python25 python2.5 |
48 |
python25 python2.5 |
| 46 |
python24 python2.4 |
49 |
python24 python2.4 |
| 47 |
python23 python2.3 |
50 |
python23 python2.3 |
|
Lines 52-57
Link Here
|
| 52 |
python15 python1.5 |
55 |
python15 python1.5 |
| 53 |
|
56 |
|
| 54 |
PATHS |
57 |
PATHS |
|
|
58 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]/libs |
| 55 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs |
59 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs |
| 56 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs |
60 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs |
| 57 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs |
61 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs |
|
Lines 63-68
Link Here
|
| 63 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/libs |
67 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/libs |
| 64 |
|
68 |
|
| 65 |
PATH_SUFFIXES |
69 |
PATH_SUFFIXES |
|
|
70 |
python2.7/config |
| 66 |
python2.6/config |
71 |
python2.6/config |
| 67 |
python2.5/config |
72 |
python2.5/config |
| 68 |
python2.4/config |
73 |
python2.4/config |
|
Lines 82-88
Link Here
|
| 82 |
SET(PYTHON_FRAMEWORK_INCLUDES) |
87 |
SET(PYTHON_FRAMEWORK_INCLUDES) |
| 83 |
IF(Python_FRAMEWORKS) |
88 |
IF(Python_FRAMEWORKS) |
| 84 |
IF(NOT PYTHON_INCLUDE_PATH) |
89 |
IF(NOT PYTHON_INCLUDE_PATH) |
| 85 |
FOREACH(version 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) |
90 |
FOREACH(version 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) |
| 86 |
FOREACH(dir ${Python_FRAMEWORKS}) |
91 |
FOREACH(dir ${Python_FRAMEWORKS}) |
| 87 |
SET(PYTHON_FRAMEWORK_INCLUDES ${PYTHON_FRAMEWORK_INCLUDES} |
92 |
SET(PYTHON_FRAMEWORK_INCLUDES ${PYTHON_FRAMEWORK_INCLUDES} |
| 88 |
${dir}/Versions/${version}/include/python${version}) |
93 |
${dir}/Versions/${version}/include/python${version}) |
|
Lines 96-101
Link Here
|
| 96 |
|
101 |
|
| 97 |
PATHS |
102 |
PATHS |
| 98 |
${PYTHON_FRAMEWORK_INCLUDES} |
103 |
${PYTHON_FRAMEWORK_INCLUDES} |
|
|
104 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]/include |
| 99 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/include |
105 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/include |
| 100 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/include |
106 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/include |
| 101 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/include |
107 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/include |
|
Lines 108-113
Link Here
|
| 108 |
|
114 |
|
| 109 |
PATH_SUFFIXES |
115 |
PATH_SUFFIXES |
| 110 |
${PREFERRED_PYTHON_VERSION} |
116 |
${PREFERRED_PYTHON_VERSION} |
|
|
117 |
python2.7 |
| 111 |
python2.6 |
118 |
python2.6 |
| 112 |
python2.5 |
119 |
python2.5 |
| 113 |
python2.4 |
120 |
python2.4 |
