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/FindJava.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/FindJava.cmake')
| -rw-r--r-- | Modules/FindJava.cmake | 12 |
1 files changed, 12 insertions, 0 deletions
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( |