ENH: Updated implementation to use new FIND_* command power. The correct library is now found on MinGW also.
This commit is contained in:
parent
3731dff127
commit
a18297e2ca
@ -32,30 +32,34 @@ IF(WIN32)
|
|||||||
ENDIF(WIN32)
|
ENDIF(WIN32)
|
||||||
|
|
||||||
FIND_LIBRARY(PYTHON_LIBRARY
|
FIND_LIBRARY(PYTHON_LIBRARY
|
||||||
NAMES python24 python2.4 python2.4.dll
|
NAMES python24 python2.4
|
||||||
python23 python2.3 python2.3.dll
|
python23 python2.3
|
||||||
python22 python2.2 python2.2.dll
|
python22 python2.2
|
||||||
python21 python2.1 python2.1.dll
|
python21 python2.1
|
||||||
python20 python2.0 python2.0.dll
|
python20 python2.0
|
||||||
python16 python1.6 python1.6.dll
|
python16 python1.6
|
||||||
python15 python1.5 python1.5.dll
|
python15 python1.5
|
||||||
|
|
||||||
PATHS
|
PATHS
|
||||||
/usr/lib/python2.4/config
|
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs
|
||||||
/usr/lib/python2.3/config
|
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/libs
|
||||||
/usr/lib/python2.2/config
|
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]/libs
|
||||||
/usr/lib/python2.1/config
|
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.1\\InstallPath]/libs
|
||||||
/usr/lib/python2.0/config
|
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.0\\InstallPath]/libs
|
||||||
/usr/lib/python1.6/config
|
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.6\\InstallPath]/libs
|
||||||
/usr/lib/python1.5/config
|
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/libs
|
||||||
/usr/lib
|
|
||||||
/usr/local/lib
|
PATH_SUFFIXES
|
||||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs
|
python2.4/config
|
||||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/libs
|
python2.3/config
|
||||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]/libs
|
python2.2/config
|
||||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.1\\InstallPath]/libs
|
python2.1/config
|
||||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.0\\InstallPath]/libs
|
python2.0/config
|
||||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.6\\InstallPath]/libs
|
python1.6/config
|
||||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/libs
|
python1.5/config
|
||||||
|
|
||||||
|
# Avoid finding the .dll in the PATH. We want the .lib.
|
||||||
|
NO_SYSTEM_ENVIRONMENT_PATH
|
||||||
)
|
)
|
||||||
|
|
||||||
# Search for the python framework on Apple.
|
# Search for the python framework on Apple.
|
||||||
@ -72,24 +76,27 @@ IF(Python_FRAMEWORKS)
|
|||||||
ENDIF(NOT PYTHON_INCLUDE_PATH)
|
ENDIF(NOT PYTHON_INCLUDE_PATH)
|
||||||
ENDIF(Python_FRAMEWORKS)
|
ENDIF(Python_FRAMEWORKS)
|
||||||
|
|
||||||
FIND_PATH(PYTHON_INCLUDE_PATH Python.h
|
FIND_PATH(PYTHON_INCLUDE_PATH
|
||||||
${PYTHON_FRAMEWORK_INCLUDES}
|
NAMES Python.h
|
||||||
/usr/include/python2.4
|
|
||||||
/usr/include/python2.3
|
PATHS
|
||||||
/usr/include/python2.2
|
${PYTHON_FRAMEWORK_INCLUDES}
|
||||||
/usr/include/python2.1
|
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/include
|
||||||
/usr/include/python2.0
|
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/include
|
||||||
/usr/include/python1.6
|
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]/include
|
||||||
/usr/include/python1.5
|
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.1\\InstallPath]/include
|
||||||
/usr/include
|
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.0\\InstallPath]/include
|
||||||
/usr/local/include
|
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.6\\InstallPath]/include
|
||||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/include
|
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/include
|
||||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/include
|
|
||||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]/include
|
PATH_SUFFIXES
|
||||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.1\\InstallPath]/include
|
python2.4
|
||||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.0\\InstallPath]/include
|
python2.3
|
||||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.6\\InstallPath]/include
|
python2.2
|
||||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/include
|
python2.1
|
||||||
|
python2.0
|
||||||
|
python1.6
|
||||||
|
python1.5
|
||||||
)
|
)
|
||||||
|
|
||||||
IF (WIN32)
|
IF (WIN32)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user