diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-02 15:41:58 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-02 15:42:07 (GMT) |
| commit | 155dc75b898fdbafccf85a345fa75a3c880113c9 (patch) | |
| tree | 67741d2dbd04227a0e9648d0eec50bd2f7ae4ea9 /Modules/FindJava.cmake | |
| parent | b162e5c0f052935cabb93823e1c36093333e545c (diff) | |
| parent | 5479074be1d64213cb3d7ccd124b9fa1d6e0cad4 (diff) | |
| download | CMake-155dc75b898fdbafccf85a345fa75a3c880113c9.zip CMake-155dc75b898fdbafccf85a345fa75a3c880113c9.tar.gz CMake-155dc75b898fdbafccf85a345fa75a3c880113c9.tar.bz2 | |
Merge topic 'FindJava-fix-1.6-registry'
5479074b FindJava: fix hint for windows jre 1.6
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1079
Diffstat (limited to 'Modules/FindJava.cmake')
| -rw-r--r-- | Modules/FindJava.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake index d762452..eb2242b 100644 --- a/Modules/FindJava.cmake +++ b/Modules/FindJava.cmake @@ -90,7 +90,7 @@ list(APPEND _JAVA_HINTS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.9;JavaHome]/bin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.8;JavaHome]/bin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.7;JavaHome]/bin" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\2.6;JavaHome]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.6;JavaHome]/bin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.5;JavaHome]/bin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.4;JavaHome]/bin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.3;JavaHome]/bin" |