diff options
author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-09-23 18:38:51 (GMT) |
---|---|---|
committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-09-23 18:38:51 (GMT) |
commit | 1d031367d929636ccc83dc860221a54e6864bbf5 (patch) | |
tree | d6828500a090bd95e6a8813ac670edce01d33622 /Modules/FindJava.cmake | |
parent | 9be341383e3b843c75a825e24834d631ffb81613 (diff) | |
download | CMake-1d031367d929636ccc83dc860221a54e6864bbf5.zip CMake-1d031367d929636ccc83dc860221a54e6864bbf5.tar.gz CMake-1d031367d929636ccc83dc860221a54e6864bbf5.tar.bz2 |
ENH: java fixes from Mathieu
Diffstat (limited to 'Modules/FindJava.cmake')
-rw-r--r-- | Modules/FindJava.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake index ba59644..466e8f6 100644 --- a/Modules/FindJava.cmake +++ b/Modules/FindJava.cmake @@ -16,6 +16,7 @@ SET(JAVA_BIN_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.5;JavaHome]/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" + $ENV{JAVA_HOME}/bin /usr/bin /usr/lib/java/bin /usr/share/java/bin @@ -25,6 +26,7 @@ SET(JAVA_BIN_PATH /usr/lib/j2sdk1.4-sun/bin /usr/java/j2sdk1.4.2_09/bin /usr/lib/j2sdk1.5-sun/bin + /opt/sun-jdk-1.5.0.04/bin ) FIND_PROGRAM(JAVA_RUNTIME NAMES java |