summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2004-09-20 18:39:44 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2004-09-20 18:39:44 (GMT)
commit26eff86298e5f8bf94cef97a20a9f0fe2eb978cd (patch)
tree99040fc79cacad014da90039a40cdf7e6b417f6d /Modules
parentbc26a216b49a7ba9367ed5fd7d411a78bbf63394 (diff)
downloadCMake-26eff86298e5f8bf94cef97a20a9f0fe2eb978cd.zip
CMake-26eff86298e5f8bf94cef97a20a9f0fe2eb978cd.tar.gz
CMake-26eff86298e5f8bf94cef97a20a9f0fe2eb978cd.tar.bz2
ENH: look for java in more places
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindJava.cmake11
1 files changed, 8 insertions, 3 deletions
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
index 3c0f116..eab8b0d 100644
--- a/Modules/FindJava.cmake
+++ b/Modules/FindJava.cmake
@@ -7,10 +7,15 @@
# JAVA_COMPILE = the full path to the Java compiler
# JAVA_ARCHIVE = the full path to the Java archiver
#
-
SET(JAVA_BIN_PATH
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\2.0;JavaHome]/bin"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.9;JavaHome]/bin"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.8;JavaHome]/bin"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.7;JavaHome]/bin"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.6;JavaHome]/bin"
+ "[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"
/usr/bin
/usr/lib/java/bin
/usr/share/java/bin