diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2002-11-14 14:38:45 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2002-11-14 14:38:45 (GMT) |
| commit | 2281726935b1a0821bb14dcc96ed99ac9c415845 (patch) | |
| tree | ff3f46b54db734e86744ebc041c70af1b185e311 /Modules/FindPythonLibs.cmake | |
| parent | b7f96d0e7505f246cee64017e1460e039c714f01 (diff) | |
| download | CMake-2281726935b1a0821bb14dcc96ed99ac9c415845.zip CMake-2281726935b1a0821bb14dcc96ed99ac9c415845.tar.gz CMake-2281726935b1a0821bb14dcc96ed99ac9c415845.tar.bz2 | |
Clean find for Python, add find for python 2.2 on windows, cleanup java on windows and add java 1.4 support
Diffstat (limited to 'Modules/FindPythonLibs.cmake')
| -rw-r--r-- | Modules/FindPythonLibs.cmake | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake index 529b077..d3340d1 100644 --- a/Modules/FindPythonLibs.cmake +++ b/Modules/FindPythonLibs.cmake @@ -12,8 +12,10 @@ IF(WIN32) FIND_LIBRARY(PYTHON_DEBUG_LIBRARY NAMES python python21_d python20_d PATHS + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]/libs/Debug [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.1\\InstallPath]/libs/Debug [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.0\\InstallPath]/libs/Debug + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]/libs [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.1\\InstallPath]/libs [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.0\\InstallPath]/libs ) @@ -23,22 +25,24 @@ FIND_LIBRARY(PYTHON_LIBRARY NAMES python python21 python2.1 python20 python2.0 python1.5 python15 python22 python2.2 PATHS /usr/lib - /usr/lib/python1.5/config + /usr/lib/python2.2/config /usr/lib/python2.1/config /usr/lib/python2.0/config - /usr/lib/python2.2/config + /usr/lib/python1.5/config /usr/local/lib + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]/libs [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.1\\InstallPath]/libs [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.0\\InstallPath]/libs ) FIND_PATH(PYTHON_INCLUDE_PATH Python.h /usr/include - /usr/include/python1.5 + /usr/include/python2.2 /usr/include/python2.1 /usr/include/python2.0 - /usr/include/python2.2 + /usr/include/python1.5 /usr/local/include + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]/include [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.1\\InstallPath]/include [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.0\\InstallPath]/include ) |