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 | |
| 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
| -rw-r--r-- | Modules/FindJNI.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindJava.cmake | 12 | ||||
| -rw-r--r-- | Modules/FindPythonLibs.cmake | 12 |
3 files changed, 22 insertions, 4 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index 3beb790..293de87 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -13,6 +13,7 @@ FIND_LIBRARY(JAVA_AWT_LIBRARY jawt /usr/local/lib /usr/lib/java/jre/lib/i386 /usr/local/lib/java/jre/lib/i386 + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib" ) @@ -22,6 +23,7 @@ FIND_PATH(JAVA_INCLUDE_PATH jni.h /usr/local/include /usr/lib/java/include /usr/local/lib/java/include + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include" ) diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake index 4fae54e..baf6b30 100644 --- a/Modules/FindJava.cmake +++ b/Modules/FindJava.cmake @@ -8,16 +8,28 @@ # JAVA_ARCHIVE = the full path to the Java archiver # +SET(JAVA_BIN_PATH + /usr/bin + /usr/lib/java/bin + /usr/share/java/bin + /usr/local/bin + /usr/local/java/bin + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin" + ) FIND_PROGRAM(JAVA_RUNTIME NAMES java + PATHS ${JAVA_BIN_PATH} ) FIND_PROGRAM(JAVA_ARCHIVE NAMES jar + PATHS ${JAVA_BIN_PATH} ) FIND_PROGRAM(JAVA_COMPILE NAMES javac + PATHS ${JAVA_BIN_PATH} ) MARK_AS_ADVANCED( 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 ) |